From patchwork Wed Nov 30 19:44:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 9454739 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 98BF06071C for ; Wed, 30 Nov 2016 19:46:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88C6E2849A for ; Wed, 30 Nov 2016 19:46:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7DD4F2849D; Wed, 30 Nov 2016 19:46:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 21D292849A for ; Wed, 30 Nov 2016 19:46:20 +0000 (UTC) Received: from localhost ([::1]:46068 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCApf-0004DQ-DG for patchwork-qemu-devel@patchwork.kernel.org; Wed, 30 Nov 2016 14:46:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCAop-0003vB-55 for qemu-devel@nongnu.org; Wed, 30 Nov 2016 14:45:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCAoo-0001z6-9X for qemu-devel@nongnu.org; Wed, 30 Nov 2016 14:45:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52714) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cCAoi-0001sh-2P; Wed, 30 Nov 2016 14:45:20 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 02A4FC0528A3; Wed, 30 Nov 2016 19:45:18 +0000 (UTC) Received: from red.redhat.com (ovpn-116-172.phx2.redhat.com [10.3.116.172]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uAUJj2nJ025934; Wed, 30 Nov 2016 14:45:18 -0500 From: Eric Blake To: qemu-devel@nongnu.org Date: Wed, 30 Nov 2016 13:44:30 -0600 Message-Id: <1480535094-23831-13-git-send-email-eblake@redhat.com> In-Reply-To: <1480535094-23831-1-git-send-email-eblake@redhat.com> References: <1480535094-23831-1-git-send-email-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 30 Nov 2016 19:45:19 +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 12/36] nbd: 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 , pbonzini@redhat.com, armbru@redhat.com, "open list:Block layer core" , Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use the new macro to avoid some boilerplate. Signed-off-by: Eric Blake --- block/nbd.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 334748d..a1dfd86 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -503,7 +503,6 @@ static void nbd_refresh_filename(BlockDriverState *bs, QDict *options) BDRVNBDState *s = bs->opaque; QDict *opts = qdict_new(); QObject *saddr_qdict; - Visitor *ov; const char *host = NULL, *port = NULL, *path = NULL; if (s->saddr->type == SOCKET_ADDRESS_KIND_INET) { @@ -532,10 +531,7 @@ static void nbd_refresh_filename(BlockDriverState *bs, QDict *options) "nbd://%s:%s", host, port); } - ov = qobject_output_visitor_new(&saddr_qdict); - visit_type_SocketAddress(ov, NULL, &s->saddr, &error_abort); - visit_complete(ov, &saddr_qdict); - visit_free(ov); + saddr_qdict = QAPI_TO_QOBJECT(SocketAddress, s->saddr, &error_abort); assert(qobject_type(saddr_qdict) == QTYPE_QDICT); qdict_put_obj(opts, "server", saddr_qdict);