From nobody Mon Feb 9 08:57:12 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 1500307125933776.4951717537224; Mon, 17 Jul 2017 08:58:45 -0700 (PDT) Received: from localhost ([::1]:51154 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX8Pz-00044U-G6 for importer@patchew.org; Mon, 17 Jul 2017 11:58:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX8O9-0002sg-6J for qemu-devel@nongnu.org; Mon, 17 Jul 2017 11:56:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dX8O8-0007b4-Dd for qemu-devel@nongnu.org; Mon, 17 Jul 2017 11:56:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48272) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dX8O6-0007Zk-6B; Mon, 17 Jul 2017 11:56:46 -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 150F44A701; Mon, 17 Jul 2017 15:56:45 +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 000D77E912; Mon, 17 Jul 2017 15:56:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 150F44A701 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=eblake@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 150F44A701 From: Eric Blake To: qemu-devel@nongnu.org Date: Mon, 17 Jul 2017 10:56:32 -0500 Message-Id: <20170717155632.12754-6-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.38]); Mon, 17 Jul 2017 15:56:45 +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 5/5] blockdev: Use simpler QAPI_TO_QOBJECT() 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: Kevin Wolf , armbru@redhat.com, "open list:Block layer core" , Max Reitz 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" Use the new macro to avoid some boilerplate. Signed-off-by: Eric Blake --- blockdev.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/blockdev.c b/blockdev.c index 7f53cc8bb3..bf26c38195 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3884,35 +3884,30 @@ void qmp_blockdev_add(BlockdevOptions *options, Err= or **errp) { BlockDriverState *bs; QObject *obj; - Visitor *v =3D qobject_output_visitor_new(&obj); QDict *qdict; Error *local_err =3D NULL; - visit_type_BlockdevOptions(v, NULL, &options, &local_err); + obj =3D QAPI_TO_QOBJECT(BlockdevOptions, options, &local_err); if (local_err) { error_propagate(errp, local_err); - goto fail; + return; } - visit_complete(v, &obj); qdict =3D qobject_to_qdict(obj); qdict_flatten(qdict); if (!qdict_get_try_str(qdict, "node-name")) { error_setg(errp, "'node-name' must be specified for the root node"= ); - goto fail; + return; } bs =3D bds_tree_init(qdict, errp); if (!bs) { - goto fail; + return; } QTAILQ_INSERT_TAIL(&monitor_bdrv_states, bs, monitor_list); - -fail: - visit_free(v); } void qmp_blockdev_del(const char *node_name, Error **errp) --=20 2.13.3