From nobody Wed Nov 5 13:49:54 2025 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 1497279923599343.9318107341619; Mon, 12 Jun 2017 08:05:23 -0700 (PDT) Received: from localhost ([::1]:38583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKQu7-0000Es-Bx for importer@patchew.org; Mon, 12 Jun 2017 11:05:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKQpP-00054p-9H for qemu-devel@nongnu.org; Mon, 12 Jun 2017 11:00:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKQpO-00038N-Au for qemu-devel@nongnu.org; Mon, 12 Jun 2017 11:00:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39980) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dKQpJ-00033Z-K8; Mon, 12 Jun 2017 11:00:21 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7C566C0587D6; Mon, 12 Jun 2017 15:00:20 +0000 (UTC) Received: from localhost (ovpn-116-115.phx2.redhat.com [10.3.116.115]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 36C307C8BE; Mon, 12 Jun 2017 15:00:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7C566C0587D6 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jcody@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 7C566C0587D6 From: Jeff Cody To: qemu-devel@nongnu.org Date: Mon, 12 Jun 2017 11:00:16 -0400 Message-Id: <33051361d0e5c63369bfb9180052ea30bbbf0661.1497279406.git.jcody@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 12 Jun 2017 15:00:20 +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/2] block/rbd: enable filename option and parsing 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, armbru@redhat.com, qemu-block@nongnu.org, rjones@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" When enabling option parsing and blockdev-add for rbd, we removed the 'filename' option. Unfortunately, this was a bit optimistic, as previous versions of QEMU allowed the use of the option in backing filenames via json. This means that without parsing this option, we cannot open existing images that used to work fine. See bug: https://bugzilla.redhat.com/show_bug.cgi?id=3D1457088 Tested-by: Richard W.M. Jones Signed-off-by: Jeff Cody --- block/rbd.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/block/rbd.c b/block/rbd.c index e551639..cbc0b85 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -340,6 +340,10 @@ static QemuOptsList runtime_opts =3D { .type =3D QEMU_OPT_STRING, .help =3D "Legacy rados key/value option parameters", }, + { + .name =3D "filename", + .type =3D QEMU_OPT_STRING, + }, { /* end of list */ } }, }; @@ -541,12 +545,24 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict = *options, int flags, { BDRVRBDState *s =3D bs->opaque; const char *pool, *snap, *conf, *user, *image_name, *keypairs; - const char *secretid; + const char *secretid, *filename; QemuOpts *opts; Error *local_err =3D NULL; char *mon_host =3D NULL; int r; =20 + /* If we are given a filename, parse the filename, with precedence giv= en to + * filename encoded options */ + filename =3D qdict_get_try_str(options, "filename"); + if (filename) { + qemu_rbd_parse_filename(filename, options, &local_err); + if (local_err) { + r =3D -EINVAL; + error_propagate(errp, local_err); + goto exit; + } + } + opts =3D qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); qemu_opts_absorb_qdict(opts, options, &local_err); if (local_err) { @@ -665,6 +681,7 @@ failed_shutdown: failed_opts: qemu_opts_del(opts); g_free(mon_host); +exit: return r; } =20 --=20 2.9.3 From nobody Wed Nov 5 13:49:54 2025 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 1497279844787758.5834390958219; Mon, 12 Jun 2017 08:04:04 -0700 (PDT) Received: from localhost ([::1]:38567 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKQso-0007Zs-Ch for importer@patchew.org; Mon, 12 Jun 2017 11:03:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59600) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKQpP-00054j-4y for qemu-devel@nongnu.org; Mon, 12 Jun 2017 11:00:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKQpO-00038C-7s for qemu-devel@nongnu.org; Mon, 12 Jun 2017 11:00:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56850) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dKQpK-000350-Jy; Mon, 12 Jun 2017 11:00:22 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 87841804E5; Mon, 12 Jun 2017 15:00:21 +0000 (UTC) Received: from localhost (ovpn-116-115.phx2.redhat.com [10.3.116.115]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 22CCC51C67; Mon, 12 Jun 2017 15:00:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 87841804E5 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 87841804E5 From: Jeff Cody To: qemu-devel@nongnu.org Date: Mon, 12 Jun 2017 11:00:17 -0400 Message-Id: <06e5d41f597b506e2550c86745db3690daf35928.1497279406.git.jcody@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 12 Jun 2017 15:00:21 +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 2/2] block/iscsi: enable filename option and parsing 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, armbru@redhat.com, qemu-block@nongnu.org, rjones@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" When enabling option parsing and blockdev-add for iscsi, we removed the 'filename' option. Unfortunately, this was a bit optimistic, as previous versions of QEMU allowed the use of the option in backing filenames via json. This means that without parsing this option, we cannot open existing images that used to work fine. See bug: https://bugzilla.redhat.com/show_bug.cgi?id=3D1457088 Tested-by: Richard W.M. Jones Signed-off-by: Jeff Cody --- block/iscsi.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/block/iscsi.c b/block/iscsi.c index 5daa201..ba50e76 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1732,6 +1732,10 @@ static QemuOptsList runtime_opts =3D { .name =3D "timeout", .type =3D QEMU_OPT_NUMBER, }, + { + .name =3D "filename", + .type =3D QEMU_OPT_STRING, + }, { /* end of list */ } }, }; @@ -1747,12 +1751,24 @@ static int iscsi_open(BlockDriverState *bs, QDict *= options, int flags, char *initiator_name =3D NULL; QemuOpts *opts; Error *local_err =3D NULL; - const char *transport_name, *portal, *target; + const char *transport_name, *portal, *target, *filename; #if LIBISCSI_API_VERSION >=3D (20160603) enum iscsi_transport_type transport; #endif int i, ret =3D 0, timeout =3D 0, lun; =20 + /* If we are given a filename, parse the filename, with precedence giv= en to + * filename encoded options */ + filename =3D qdict_get_try_str(options, "filename"); + if (filename) { + iscsi_parse_filename(filename, options, &local_err); + if (local_err) { + ret =3D -EINVAL; + error_propagate(errp, local_err); + goto exit; + } + } + opts =3D qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); qemu_opts_absorb_qdict(opts, options, &local_err); if (local_err) { @@ -1967,6 +1983,7 @@ out: } memset(iscsilun, 0, sizeof(IscsiLun)); } +exit: return ret; } =20 --=20 2.9.3