From nobody Tue Feb 10 10:54:11 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1528353150718307.5415445955624; Wed, 6 Jun 2018 23:32:30 -0700 (PDT) Received: from localhost ([::1]:55943 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQoTF-0006l8-4c for importer@patchew.org; Thu, 07 Jun 2018 02:32:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQoNA-0000nU-Ey for qemu-devel@nongnu.org; Thu, 07 Jun 2018 02:26:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQoN8-0002pm-AE for qemu-devel@nongnu.org; Thu, 07 Jun 2018 02:26:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50592) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fQoN2-0002gd-49; Thu, 07 Jun 2018 02:26:04 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 68D0313A88; Thu, 7 Jun 2018 06:26:03 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 007BD2010CBC; Thu, 7 Jun 2018 06:26:02 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id EA77C11386B4; Thu, 7 Jun 2018 08:25:59 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 7 Jun 2018 08:25:47 +0200 Message-Id: <20180607062559.16127-8-armbru@redhat.com> In-Reply-To: <20180607062559.16127-1-armbru@redhat.com> References: <20180607062559.16127-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 07 Jun 2018 06:26:03 +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] [RFC PATCH 07/19] block: Fix -drive for certain non-string scalars 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: kwolf@redhat.com, jcody@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com 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" The previous commit fixed -blockdev breakage due to misuse of the qobject input visitor's keyval flavor in bdrv_file_open(). The commit message explain why using the plain flavor would be just as wrong; it would break -drive. Turns out we break it in three places: nbd_open(), sd_open() and ssh_file_open(). They are even marked FIXME. Example breakage: $ qemu-system-x86 -drive node-name=3Dn1,driver=3Dnbd,server.type=3Dinet= ,server.host=3Dlocalhost,server.port=3D1234,server.numeric=3Doff qemu-system-x86: -drive node-name=3Dn1,driver=3Dnbd,server.type=3Dinet,= server.host=3Dlocalhost,server.port=3D1234,server.numeric=3Doff: Invalid pa= rameter type for 'numeric', expected: boolean Fix it the same way: replace qdict_crumple() by qdict_crumple_for_keyval_qiv(), and switch from plain to the keyval flavor. Signed-off-by: Markus Armbruster --- block/nbd.c | 12 ++---------- block/sheepdog.c | 12 ++---------- block/ssh.c | 12 ++---------- 3 files changed, 6 insertions(+), 30 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index d6c4c4ddbc..614dd9fec0 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -273,20 +273,12 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QDi= ct *options, goto done; } =20 - crumpled_addr =3D qdict_crumple(addr, errp); + crumpled_addr =3D qdict_crumple_for_keyval_qiv(addr, errp); if (!crumpled_addr) { goto done; } =20 - /* - * FIXME .numeric, .to, .ipv4 or .ipv6 don't work with -drive - * server.type=3Dinet. .to doesn't matter, it's ignored anyway. - * That's because when @options come from -blockdev or - * blockdev_add, members are typed according to the QAPI schema, - * but when they come from -drive, they're all QString. The - * visitor expects the former. - */ - iv =3D qobject_input_visitor_new(crumpled_addr); + iv =3D qobject_input_visitor_new_keyval(crumpled_addr); visit_type_SocketAddress(iv, NULL, &saddr, &local_err); if (local_err) { error_propagate(errp, local_err); diff --git a/block/sheepdog.c b/block/sheepdog.c index a93f93d360..29e3e1eaaa 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -546,20 +546,12 @@ static SocketAddress *sd_server_config(QDict *options= , Error **errp) =20 qdict_extract_subqdict(options, &server, "server."); =20 - crumpled_server =3D qdict_crumple(server, errp); + crumpled_server =3D qdict_crumple_for_keyval_qiv(server, errp); if (!crumpled_server) { goto done; } =20 - /* - * FIXME .numeric, .to, .ipv4 or .ipv6 don't work with -drive - * server.type=3Dinet. .to doesn't matter, it's ignored anyway. - * That's because when @options come from -blockdev or - * blockdev_add, members are typed according to the QAPI schema, - * but when they come from -drive, they're all QString. The - * visitor expects the former. - */ - iv =3D qobject_input_visitor_new(crumpled_server); + iv =3D qobject_input_visitor_new_keyval(crumpled_server); visit_type_SocketAddress(iv, NULL, &saddr, &local_err); if (local_err) { error_propagate(errp, local_err); diff --git a/block/ssh.c b/block/ssh.c index eec37dd27c..bd85d989d5 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -623,20 +623,12 @@ static BlockdevOptionsSsh *ssh_parse_options(QDict *o= ptions, Error **errp) } =20 /* Create the QAPI object */ - crumpled =3D qdict_crumple(options, errp); + crumpled =3D qdict_crumple_for_keyval_qiv(options, errp); if (crumpled =3D=3D NULL) { goto fail; } =20 - /* - * FIXME .numeric, .to, .ipv4 or .ipv6 don't work with -drive. - * .to doesn't matter, it's ignored anyway. - * That's because when @options come from -blockdev or - * blockdev_add, members are typed according to the QAPI schema, - * but when they come from -drive, they're all QString. The - * visitor expects the former. - */ - v =3D qobject_input_visitor_new(crumpled); + v =3D qobject_input_visitor_new_keyval(crumpled); visit_type_BlockdevOptionsSsh(v, NULL, &result, &local_err); visit_free(v); qobject_unref(crumpled); --=20 2.17.1