From nobody Mon Feb 9 18:19:25 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.zoho.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 1490710101950882.1240514938875; Tue, 28 Mar 2017 07:08:21 -0700 (PDT) Received: from localhost ([::1]:53526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csrnI-0000yP-LP for importer@patchew.org; Tue, 28 Mar 2017 10:08:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csrlH-0007jP-5j for qemu-devel@nongnu.org; Tue, 28 Mar 2017 10:06:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1csrlG-00082W-5R for qemu-devel@nongnu.org; Tue, 28 Mar 2017 10:06:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38694) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1csrlA-00080O-Q2; Tue, 28 Mar 2017 10:06:08 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CFF7B7FD50; Tue, 28 Mar 2017 14:06:07 +0000 (UTC) Received: from localhost (ovpn-117-90.phx2.redhat.com [10.3.117.90]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7288381C27; Tue, 28 Mar 2017 14:06:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CFF7B7FD50 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jcody@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com CFF7B7FD50 From: Jeff Cody To: qemu-block@nongnu.org Date: Tue, 28 Mar 2017 10:05:50 -0400 Message-Id: <20170328140555.3001-6-jcody@redhat.com> In-Reply-To: <20170328140555.3001-1-jcody@redhat.com> References: <20170328140555.3001-1-jcody@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 28 Mar 2017 14:06:08 +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] [PULL for-2.9 05/10] rbd: Don't accept -drive driver=rbd, keyvalue-pairs=... 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: peter.maydell@linaro.org, jcody@redhat.com, armbru@redhat.com, qemu-devel@nongnu.org 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" From: Markus Armbruster The way we communicate extra key-value pairs from qemu_rbd_parse_filename() to qemu_rbd_open() exposes option parameter "keyvalue-pairs" on the command line. It's not wanted there. Hack: rename the parameter to "=3Dkeyvalue-pairs" to make it inaccessible. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Max Reitz Reviewed-by: Jeff Cody Message-id: 1490691368-32099-6-git-send-email-armbru@redhat.com Signed-off-by: Jeff Cody --- block/rbd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index 182a5a3..2632533 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -215,7 +215,7 @@ static void qemu_rbd_parse_filename(const char *filenam= e, QDict *options, } =20 if (keypairs[0]) { - qdict_put(options, "keyvalue-pairs", qstring_from_str(keypairs)); + qdict_put(options, "=3Dkeyvalue-pairs", qstring_from_str(keypairs)= ); } =20 =20 @@ -330,7 +330,11 @@ static QemuOptsList runtime_opts =3D { .help =3D "Rados id name", }, { - .name =3D "keyvalue-pairs", + /* + * HACK: name starts with '=3D' so that qemu_opts_parse() + * can't set it + */ + .name =3D "=3Dkeyvalue-pairs", .type =3D QEMU_OPT_STRING, .help =3D "Legacy rados key/value option parameters", }, @@ -405,7 +409,7 @@ static int qemu_rbd_create(const char *filename, QemuOp= ts *opts, Error **errp) conf =3D qemu_opt_get(rbd_opts, "conf"); clientname =3D qemu_opt_get(rbd_opts, "user"); name =3D qemu_opt_get(rbd_opts, "image"); - keypairs =3D qemu_opt_get(rbd_opts, "keyvalue-pairs"); + keypairs =3D qemu_opt_get(rbd_opts, "=3Dkeyvalue-pairs"); =20 ret =3D rados_create(&cluster, clientname); if (ret < 0) { @@ -638,7 +642,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *o= ptions, int flags, snap =3D qemu_opt_get(opts, "snapshot"); clientname =3D qemu_opt_get(opts, "user"); name =3D qemu_opt_get(opts, "image"); - keypairs =3D qemu_opt_get(opts, "keyvalue-pairs"); + keypairs =3D qemu_opt_get(opts, "=3Dkeyvalue-pairs"); =20 if (!pool || !name) { error_setg(errp, "Parameters 'pool' and 'image' are required"); --=20 2.9.3