From nobody Wed Nov 5 20:03:29 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.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 1536643247832675.5566873986306; Mon, 10 Sep 2018 22:20:47 -0700 (PDT) Received: from localhost ([::1]:55452 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fzb6U-0006dj-FM for importer@patchew.org; Tue, 11 Sep 2018 01:20:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fzb3n-0004Tx-82 for qemu-devel@nongnu.org; Tue, 11 Sep 2018 01:18:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fzb1t-0004hw-Ry for qemu-devel@nongnu.org; Tue, 11 Sep 2018 01:16:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42258) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fzb1s-0004eD-Kg; Tue, 11 Sep 2018 01:16:00 -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 9AB1EC058CA6; Tue, 11 Sep 2018 05:15:59 +0000 (UTC) Received: from localhost (ovpn-116-183.phx2.redhat.com [10.3.116.183]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 23B7120165D7; Tue, 11 Sep 2018 05:15:57 +0000 (UTC) From: Jeff Cody To: qemu-devel@nongnu.org Date: Tue, 11 Sep 2018 01:15:49 -0400 Message-Id: <570e8585c94d6f1bd7406ce5d35f68a82b6ea28c.1536642773.git.jcody@redhat.com> In-Reply-To: References: In-Reply-To: References: 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.32]); Tue, 11 Sep 2018 05:15:59 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] block/rbd: Attempt to parse legacy filenames 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, jsnow@redhat.com, qemu-stable@nongnu.org, qemu-block@nongnu.org, armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When we converted rbd to get rid of the older key/value-centric encoding format, we broke compatibility with image files with backing file strings encoded in the old format. This leaves a bit of an ugly conundrum, and a hacky solution. If the initial attempt to parse the "proper" options fails, it assumes that we may have an older key/value encoded filename. Fall back to attempting to parse the filename, and extract the required options from it. If that fails, pass along the original error message. This approach has a potential drawback: if for some reason there are some options supplied the new way, and some the old way, we may not catch all the old options if they are not required options (since it won't cause the initial failure). Signed-off-by: Jeff Cody --- block/rbd.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index a8e79d01d2..bce86b8bde 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -685,7 +685,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *o= ptions, int flags, BlockdevOptionsRbd *opts =3D NULL; const QDictEntry *e; Error *local_err =3D NULL; - char *keypairs, *secretid; + char *keypairs, *secretid, *filename; int r; =20 keypairs =3D g_strdup(qdict_get_try_str(options, "=3Dkeyvalue-pairs")); @@ -700,8 +700,32 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *= options, int flags, =20 r =3D qemu_rbd_convert_options(bs, options, &opts, &local_err); if (local_err) { - error_propagate(errp, local_err); - goto out; + /* If the initial attempt to convert and process the options faile= d, + * we may be attempting to open an image file that has the rbd opt= ions + * specified in the older format consisting of all key/value pairs + * encoded in the filename. Go ahead and attempt to parse the + * filename, and see if we can pull out the required options */ + Error *parse_err =3D NULL; + + filename =3D g_strdup(qdict_get_try_str(options, "filename")); + qdict_del(options, "filename"); + + qemu_rbd_parse_filename(filename, options, NULL); + + g_free(keypairs); + keypairs =3D g_strdup(qdict_get_try_str(options, "=3Dkeyvalue-pair= s")); + if (keypairs) { + qdict_del(options, "=3Dkeyvalue-pairs"); + } + + r =3D qemu_rbd_convert_options(bs, options, &opts, &parse_err); + if (parse_err) { + /* if the second attempt failed, pass along the original error + * message for the current format */ + error_propagate(errp, local_err); + error_free(parse_err); + goto out; + } } =20 /* Remove the processed options from the QDict (the visitor processes --=20 2.17.1