From nobody Sun Feb 8 12:14:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500307116039769.9010455355162; Mon, 17 Jul 2017 08:58:36 -0700 (PDT) Received: from localhost ([::1]:51152 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX8Pn-0003vG-V2 for importer@patchew.org; Mon, 17 Jul 2017 11:58:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57255) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX8Ny-0002mB-QD for qemu-devel@nongnu.org; Mon, 17 Jul 2017 11:56:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dX8Nx-0007W5-4g for qemu-devel@nongnu.org; Mon, 17 Jul 2017 11:56:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44912) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dX8Nw-0007Vq-UK for qemu-devel@nongnu.org; Mon, 17 Jul 2017 11:56:37 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BA5F7C04B303; Mon, 17 Jul 2017 15:56:35 +0000 (UTC) Received: from red.redhat.com (ovpn-120-160.rdu2.redhat.com [10.10.120.160]) by smtp.corp.redhat.com (Postfix) with ESMTP id 24F7F7E8E7; Mon, 17 Jul 2017 15:56:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com BA5F7C04B303 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=eblake@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com BA5F7C04B303 From: Eric Blake To: qemu-devel@nongnu.org Date: Mon, 17 Jul 2017 10:56:28 -0500 Message-Id: <20170717155632.12754-2-eblake@redhat.com> In-Reply-To: <20170717155632.12754-1-eblake@redhat.com> References: <20170717155632.12754-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 17 Jul 2017 15:56:35 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/5] qapi: Add QAPI_TO_QOBJECT() convenience macro X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: armbru@redhat.com, Michael Roth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We have several callers that want to convert a QAPI C type into a QObject; right now all of them have to copy the same boilerplate of creating a visitor. A convenience macro makes this paradigm easier to type. Signed-off-by: Eric Blake --- include/qapi/qobject-output-visitor.h | 19 +++++++++++++++++++ qapi/qobject-output-visitor.c | 16 ++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/include/qapi/qobject-output-visitor.h b/include/qapi/qobject-o= utput-visitor.h index e5a3490812..f6066ce537 100644 --- a/include/qapi/qobject-output-visitor.h +++ b/include/qapi/qobject-output-visitor.h @@ -16,6 +16,8 @@ #include "qapi/visitor.h" #include "qapi/qmp/qobject.h" +#include "qapi/error.h" +#include "qapi-visit.h" typedef struct QObjectOutputVisitor QObjectOutputVisitor; @@ -54,4 +56,21 @@ typedef struct QObjectOutputVisitor QObjectOutputVisitor; */ Visitor *qobject_output_visitor_new(QObject **result); +QObject *qapi_to_qobject(const void *src, + void (*visit_type)(Visitor *, const char *, + void **, Error **), + Error **errp); + +/* + * Create a QObject from a QAPI object @src of the given @type. + * + * Not usable on QAPI scalars (integers, strings, enums), nor on a + * QAPI object that references the 'any' type. @src must not be NULL. + */ +#define QAPI_TO_QOBJECT(type, src, err) \ + (qapi_to_qobject(1 ? (src) : (type *)NULL, \ + (void (*)(Visitor *, const char *, void**, \ + Error **))visit_type_ ## type, \ + err)) + #endif diff --git a/qapi/qobject-output-visitor.c b/qapi/qobject-output-visitor.c index 70be84ccb5..0b1f098fa1 100644 --- a/qapi/qobject-output-visitor.c +++ b/qapi/qobject-output-visitor.c @@ -251,3 +251,19 @@ Visitor *qobject_output_visitor_new(QObject **result) return &v->visitor; } + +QObject *qapi_to_qobject(const void *src, + void (*visit_type)(Visitor *, const char *, + void **, Error **), + Error **errp) +{ + Visitor *v; + void *s =3D (void *) src; /* cast away const */ + QObject *dst =3D NULL; + + v =3D qobject_output_visitor_new(&dst); + visit_type(v, NULL, &s, &error_abort); + visit_complete(v, &dst); + visit_free(v); + return dst; +} --=20 2.13.3