Series comparison

-[Qemu-devel] [PULL 0/4] Block patches
+[PULL 0/2] Block patches
-The following changes since commit 19b599f7664b2ebfd0f405fb79c14dd241557452:
+The following changes since commit ca61fa4b803e5d0abaf6f1ceb690f23bb78a4def:
-  Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2018-08-27-v2' into staging (2018-08-27 16:44:20 +0100)
+  Merge remote-tracking branch 'remotes/quic/tags/pull-hex-20211006' into staging (2021-10-06 12:11:14 -0700)
 are available in the Git repository at:
-  git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request
+  https://gitlab.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 8af2eb7b43a1b694fd6d1d090025027d6b72caac:
+for you to fetch changes up to 1cc7eada97914f090125e588497986f6f7900514:
-  block/rbd: add deprecation documentation for filename keyvalue pairs (2018-09-12 08:51:45 -0400)
+  iothread: use IOThreadParamInfo in iothread_[set|get]_param() (2021-10-07 15:29:50 +0100)
 ----------------------------------------------------------------
-Block patches for RBD
+Pull request
 ----------------------------------------------------------------
-Jeff Cody (4):
+Stefano Garzarella (2):
-  block/rbd: pull out qemu_rbd_convert_options
+  iothread: rename PollParamInfo to IOThreadParamInfo
-  block/rbd: Attempt to parse legacy filenames
+  iothread: use IOThreadParamInfo in iothread_[set|get]_param()
   block/rbd: add iotest for rbd legacy keyvalue filename parsing
   block/rbd: add deprecation documentation for filename keyvalue pairs
- block/rbd.c                | 89 ++++++++++++++++++++++++++++++++------
+ iothread.c | 28 +++++++++++++++-------------
- qemu-deprecated.texi       | 15 +++++++
+file changed, 15 insertions(+), 13 deletions(-)
  tests/qemu-iotests/231     | 62 ++++++++++++++++++++++++++
  tests/qemu-iotests/231.out |  9 ++++
  tests/qemu-iotests/group   |  1 +
 files changed, 162 insertions(+), 14 deletions(-)
  create mode 100755 tests/qemu-iotests/231
  create mode 100644 tests/qemu-iotests/231.out
 --
-.17.1
+.31.1

-[Qemu-devel] [PULL 4/4] block/rbd: add deprecation documentation for filename keyvalue pairs
+[PULL 1/2] iothread: rename PollParamInfo to IOThreadParamInfo
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+From: Stefano Garzarella <sgarzare@redhat.com>
-Message-id: 647f5b5ab7efd8bf567a504c832b1d2d6f719b23.1536704901.git.jcody@redhat.com
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+Commit 1793ad0247 ("iothread: add aio-max-batch parameter") added
 a new parameter (aio-max-batch) to IOThread and used PollParamInfo
 structure to handle it.
 Since it is not a parameter of the polling mechanism, we rename the
 structure to a more generic IOThreadParamInfo.
 Suggested-by: Kevin Wolf <kwolf@redhat.com>
 Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
 Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
 Message-id: 20210727145936.147032-2-sgarzare@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- qemu-deprecated.texi | 15 +++++++++++++++
+ iothread.c | 14 +++++++-------
-file changed, 15 insertions(+)
+file changed, 7 insertions(+), 7 deletions(-)
-diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
+diff --git a/iothread.c b/iothread.c
 index XXXXXXX..XXXXXXX 100644
---- a/qemu-deprecated.texi
+--- a/iothread.c
-+++ b/qemu-deprecated.texi
++++ b/iothread.c
-@@ -XXX,XX +XXX,XX @@ used instead.
+@@ -XXX,XX +XXX,XX @@ static void iothread_complete(UserCreatable *obj, Error **errp)
- In order to prevent QEMU from automatically opening an image's backing
+ typedef struct {
- chain, use ``"backing": null'' instead.
+     const char *name;
+     ptrdiff_t offset; /* field's byte offset in IOThread struct */
-+@subsubsection rbd keyvalue pair encoded filenames: "" (since 3.1.0)
+-} PollParamInfo;
-+
++} IOThreadParamInfo;
-+Options for ``rbd'' should be specified according to its runtime options,
-+like other block drivers.  Legacy parsing of keyvalue pair encoded
+-static PollParamInfo poll_max_ns_info = {
-+filenames is useful to open images with the old format for backing files;
++static IOThreadParamInfo poll_max_ns_info = {
-+These image files should be updated to use the current format.
+     "poll-max-ns", offsetof(IOThread, poll_max_ns),
-+
+ };
-+Example of legacy encoding:
+-static PollParamInfo poll_grow_info = {
-+
++static IOThreadParamInfo poll_grow_info = {
-+@code{json:@{"file.driver":"rbd", "file.filename":"rbd:rbd/name"@}}
+     "poll-grow", offsetof(IOThread, poll_grow),
-+
+ };
-+The above, converted to the current supported format:
+-static PollParamInfo poll_shrink_info = {
-+
++static IOThreadParamInfo poll_shrink_info = {
-+@code{json:@{"file.driver":"rbd", "file.pool":"rbd", "file.image":"name"@}}
+     "poll-shrink", offsetof(IOThread, poll_shrink),
-+
+ };
- @subsection vio-spapr-device device options
+-static PollParamInfo aio_max_batch_info = {
++static IOThreadParamInfo aio_max_batch_info = {
- @subsubsection "irq": "" (since 3.0.0)
+     "aio-max-batch", offsetof(IOThread, aio_max_batch),
  };
@@ -XXX,XX +XXX,XX @@ static void iothread_get_param(Object *obj, Visitor *v,
          const char *name, void *opaque, Error **errp)
  {
      IOThread *iothread = IOTHREAD(obj);
 -    PollParamInfo *info = opaque;
 +    IOThreadParamInfo *info = opaque;
      int64_t *field = (void *)iothread + info->offset;
      visit_type_int64(v, name, field, errp);
@@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v,
          const char *name, void *opaque, Error **errp)
  {
      IOThread *iothread = IOTHREAD(obj);
 -    PollParamInfo *info = opaque;
 +    IOThreadParamInfo *info = opaque;
      int64_t *field = (void *)iothread + info->offset;
      int64_t value;
 --
-.17.1
+.31.1

-[Qemu-devel] [PULL 1/4] block/rbd: pull out qemu_rbd_convert_options
+[PULL 2/2] iothread: use IOThreadParamInfo in iothread_[set|get]_param()
-Code movement to pull the conversion from Qdict to BlockdevOptionsRbd
+From: Stefano Garzarella <sgarzare@redhat.com>
 into a helper function.
-Reviewed-by: Eric Blake <eblake@redhat.com>
+Commit 0445409d74 ("iothread: generalize
-Reviewed-by: John Snow <jsnow@redhat.com>
+iothread_set_param/iothread_get_param") moved common code to set and
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+get IOThread parameters in two new functions.
-Message-id: 5b49a980f2cde6610ab1df41bb0277d00b5db893.1536704901.git.jcody@redhat.com
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+These functions are called inside callbacks, so we don't need to use an
 opaque pointer. Let's replace `void *opaque` parameter with
 `IOThreadParamInfo *info`.
 Suggested-by: Kevin Wolf <kwolf@redhat.com>
 Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
 Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
 Message-id: 20210727145936.147032-3-sgarzare@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block/rbd.c | 36 ++++++++++++++++++++++++------------
+ iothread.c | 18 ++++++++++--------
-file changed, 24 insertions(+), 12 deletions(-)
+file changed, 10 insertions(+), 8 deletions(-)
-diff --git a/block/rbd.c b/block/rbd.c
+diff --git a/iothread.c b/iothread.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/rbd.c
+--- a/iothread.c
-+++ b/block/rbd.c
++++ b/iothread.c
-@@ -XXX,XX +XXX,XX @@ failed_opts:
+@@ -XXX,XX +XXX,XX @@ static IOThreadParamInfo aio_max_batch_info = {
-     return r;
+ };
  static void iothread_get_param(Object *obj, Visitor *v,
 -        const char *name, void *opaque, Error **errp)
 +        const char *name, IOThreadParamInfo *info, Error **errp)
  {
      IOThread *iothread = IOTHREAD(obj);
 -    IOThreadParamInfo *info = opaque;
      int64_t *field = (void *)iothread + info->offset;
      visit_type_int64(v, name, field, errp);
  }
-+static int qemu_rbd_convert_options(QDict *options, BlockdevOptionsRbd **opts,
+ static bool iothread_set_param(Object *obj, Visitor *v,
-+                                    Error **errp)
+-        const char *name, void *opaque, Error **errp)
-+{
++        const char *name, IOThreadParamInfo *info, Error **errp)
 +    Visitor *v;
 +    Error *local_err = NULL;
 +
 +    /* Convert the remaining options into a QAPI object */
 +    v = qobject_input_visitor_new_flat_confused(options, errp);
 +    if (!v) {
 +        return -EINVAL;
 +    }
 +
 +    visit_type_BlockdevOptionsRbd(v, NULL, opts, &local_err);
 +    visit_free(v);
 +
 +    if (local_err) {
 +        error_propagate(errp, local_err);
 +        return -EINVAL;
 +    }
 +
 +    return 0;
 +}
 +
  static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
                           Error **errp)
  {
-     BDRVRBDState *s = bs->opaque;
+     IOThread *iothread = IOTHREAD(obj);
-     BlockdevOptionsRbd *opts = NULL;
+-    IOThreadParamInfo *info = opaque;
--    Visitor *v;
+     int64_t *field = (void *)iothread + info->offset;
-     const QDictEntry *e;
+     int64_t value;
-     Error *local_err = NULL;
-     char *keypairs, *secretid;
+@@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v,
-@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
+ static void iothread_get_poll_param(Object *obj, Visitor *v,
-         qdict_del(options, "password-secret");
+         const char *name, void *opaque, Error **errp)
  {
 +    IOThreadParamInfo *info = opaque;
 -    iothread_get_param(obj, v, name, opaque, errp);
 +    iothread_get_param(obj, v, name, info, errp);
  }
  static void iothread_set_poll_param(Object *obj, Visitor *v,
          const char *name, void *opaque, Error **errp)
  {
      IOThread *iothread = IOTHREAD(obj);
 +    IOThreadParamInfo *info = opaque;
 -    if (!iothread_set_param(obj, v, name, opaque, errp)) {
 +    if (!iothread_set_param(obj, v, name, info, errp)) {
          return;
      }
--    /* Convert the remaining options into a QAPI object */
+@@ -XXX,XX +XXX,XX @@ static void iothread_set_poll_param(Object *obj, Visitor *v,
--    v = qobject_input_visitor_new_flat_confused(options, errp);
+ static void iothread_get_aio_param(Object *obj, Visitor *v,
--    if (!v) {
+         const char *name, void *opaque, Error **errp)
--        r = -EINVAL;
+ {
--        goto out;
++    IOThreadParamInfo *info = opaque;
--    }
--
+-    iothread_get_param(obj, v, name, opaque, errp);
--    visit_type_BlockdevOptionsRbd(v, NULL, &opts, &local_err);
++    iothread_get_param(obj, v, name, info, errp);
--    visit_free(v);
+ }
--
-+    r = qemu_rbd_convert_options(options, &opts, &local_err);
+ static void iothread_set_aio_param(Object *obj, Visitor *v,
-     if (local_err) {
+         const char *name, void *opaque, Error **errp)
-         error_propagate(errp, local_err);
+ {
--        r = -EINVAL;
+     IOThread *iothread = IOTHREAD(obj);
-         goto out;
++    IOThreadParamInfo *info = opaque;
 -    if (!iothread_set_param(obj, v, name, opaque, errp)) {
 +    if (!iothread_set_param(obj, v, name, info, errp)) {
          return;
      }
 --
-.17.1
+.31.1

-[Qemu-devel] [PULL 2/4] block/rbd: Attempt to parse legacy filenames
+Deleted patch
-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.
-We do not support mixed modern usage alongside legacy keyvalue pair
-usage.
-A deprecation warning has been added, although care should be taken
-when actually deprecating since the impact is not limited to
-commandline or qapi usage, but also opening existing images.
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Jeff Cody <jcody@redhat.com>
-Message-id: 15b332e5432ad069441f7275a46080f465d789a0.1536704901.git.jcody@redhat.com
-Signed-off-by: Jeff Cody <jcody@redhat.com>
----
- block/rbd.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
-file changed, 51 insertions(+), 2 deletions(-)
-diff --git a/block/rbd.c b/block/rbd.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/rbd.c
-+++ b/block/rbd.c
-@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_convert_options(QDict *options, BlockdevOptionsRbd **opts,
-     return 0;
- }
-+static int qemu_rbd_attempt_legacy_options(QDict *options,
-+                                           BlockdevOptionsRbd **opts,
-+                                           char **keypairs)
-+{
-+    char *filename;
-+    int r;
-+
-+    filename = g_strdup(qdict_get_try_str(options, "filename"));
-+    if (!filename) {
-+        return -EINVAL;
-+    }
-+    qdict_del(options, "filename");
-+
-+    qemu_rbd_parse_filename(filename, options, NULL);
-+
-+    /* keypairs freed by caller */
-+    *keypairs = g_strdup(qdict_get_try_str(options, "=keyvalue-pairs"));
-+    if (*keypairs) {
-+        qdict_del(options, "=keyvalue-pairs");
-+    }
-+
-+    r = qemu_rbd_convert_options(options, opts, NULL);
-+
-+    g_free(filename);
-+    return r;
-+}
-+
- static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
-                          Error **errp)
- {
-@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
-     r = qemu_rbd_convert_options(options, &opts, &local_err);
-     if (local_err) {
--        error_propagate(errp, local_err);
--        goto out;
-+        /* If keypairs are present, that means some options are present in
-+         * the modern option format.  Don't attempt to parse legacy option
-+         * formats, as we won't support mixed usage. */
-+        if (keypairs) {
-+            error_propagate(errp, local_err);
-+            goto out;
-+        }
-+
-+        /* If the initial attempt to convert and process the options failed,
-+         * we may be attempting to open an image file that has the rbd options
-+         * 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. */
-+        r = qemu_rbd_attempt_legacy_options(options, &opts, &keypairs);
-+        if (r < 0) {
-+            error_propagate(errp, local_err);
-+            goto out;
-+        }
-+        /* Take care whenever deciding to actually deprecate; once this ability
-+         * is removed, we will not be able to open any images with legacy-styled
-+         * backing image strings. */
-+        error_report("RBD options encoded in the filename as keyvalue pairs "
-+                     "is deprecated.  Future versions may cease to parse "
-+                     "these options in the future.");
-     }
-     /* Remove the processed options from the QDict (the visitor processes
---
-.17.1

-[Qemu-devel] [PULL 3/4] block/rbd: add iotest for rbd legacy keyvalue filename parsing
+Deleted patch
-This is a small test that will check for the ability to parse
-both legacy and modern options for rbd.
-The way the test is set up is for failure to occur, but without
-having to wait to timeout on a non-existent rbd server.  The error
-messages in the success path show that the arguments were parsed.
-The failure behavior prior to the patch series that has this test, is
-qemu-img complaining about mandatory options (e.g. 'pool') not being
-provided.
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Jeff Cody <jcody@redhat.com>
-Message-id: f830580e339b974a83ed4870d11adcdc17f49a47.1536704901.git.jcody@redhat.com
-Signed-off-by: Jeff Cody <jcody@redhat.com>
----
- tests/qemu-iotests/231     | 62 ++++++++++++++++++++++++++++++++++++++
- tests/qemu-iotests/231.out |  9 ++++++
- tests/qemu-iotests/group   |  1 +
-files changed, 72 insertions(+)
- create mode 100755 tests/qemu-iotests/231
- create mode 100644 tests/qemu-iotests/231.out
-diff --git a/tests/qemu-iotests/231 b/tests/qemu-iotests/231
-new file mode 100755
-index XXXXXXX..XXXXXXX
---- /dev/null
-+++ b/tests/qemu-iotests/231
-@@ -XXX,XX +XXX,XX @@
-+#!/bin/bash
-+#
-+# Test legacy and modern option parsing for rbd/ceph.  This will not
-+# actually connect to a ceph server, but rather looks for the appropriate
-+# error message that indicates we parsed the options correctly.
-+#
-+# Copyright (C) 2018 Red Hat, Inc.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+#
-+
-+# creator
-+owner=jcody@redhat.com
-+
-+seq=`basename $0`
-+echo "QA output created by $seq"
-+
-+here=`pwd`
-+status=1    # failure is the default!
-+
-+_cleanup()
-+{
-+    rm "${BOGUS_CONF}"
-+}
-+trap "_cleanup; exit \$status" 0 1 2 3 15
-+
-+# get standard environment, filters and checks
-+. ./common.rc
-+. ./common.filter
-+
-+_supported_fmt generic
-+_supported_proto rbd
-+_supported_os Linux
-+
-+BOGUS_CONF=${TEST_DIR}/ceph-$$.conf
-+touch "${BOGUS_CONF}"
-+
-+_filter_conf()
-+{
-+    sed -e "s#$BOGUS_CONF#BOGUS_CONF#g"
-+}
-+
-+# We expect this to fail, with no monitor ip provided and a null conf file.  Just want it
-+# to fail in the right way.
-+$QEMU_IMG info "json:{'file.driver':'rbd','file.filename':'rbd:rbd/bogus:conf=${BOGUS_CONF}'}" 2>&1 | _filter_conf
-+$QEMU_IMG info "json:{'file.driver':'rbd','file.pool':'rbd','file.image':'bogus','file.conf':'${BOGUS_CONF}'}" 2>&1 | _filter_conf
-+
-+# success, all done
-+echo "*** done"
-+rm -f $seq.full
-+status=0
-diff --git a/tests/qemu-iotests/231.out b/tests/qemu-iotests/231.out
-new file mode 100644
-index XXXXXXX..XXXXXXX
---- /dev/null
-+++ b/tests/qemu-iotests/231.out
-@@ -XXX,XX +XXX,XX @@
-+QA output created by 231
-+qemu-img: RBD options encoded in the filename as keyvalue pairs is deprecated.  Future versions may cease to parse these options in the future.
-+unable to get monitor info from DNS SRV with service name: ceph-mon
-+no monitors specified to connect to.
-+qemu-img: Could not open 'json:{'file.driver':'rbd','file.filename':'rbd:rbd/bogus:conf=BOGUS_CONF'}': error connecting: No such file or directory
-+unable to get monitor info from DNS SRV with service name: ceph-mon
-+no monitors specified to connect to.
-+qemu-img: Could not open 'json:{'file.driver':'rbd','file.pool':'rbd','file.image':'bogus','file.conf':'BOGUS_CONF'}': error connecting: No such file or directory
-+*** done
-diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/group
-+++ b/tests/qemu-iotests/group
-@@ -XXX,XX +XXX,XX @@
-auto quick
-auto quick
-auto quick
-+231 auto quick
---
-.17.1

The following changes since commit 19b599f7664b2ebfd0f405fb79c14dd241557452:

Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2018-08-27-v2' into staging (2018-08-27 16:44:20 +0100)

are available in the Git repository at:

git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request

for you to fetch changes up to 8af2eb7b43a1b694fd6d1d090025027d6b72caac:

block/rbd: add deprecation documentation for filename keyvalue pairs (2018-09-12 08:51:45 -0400)

----------------------------------------------------------------
Block patches for RBD
----------------------------------------------------------------

Jeff Cody (4):
  block/rbd: pull out qemu_rbd_convert_options
  block/rbd: Attempt to parse legacy filenames
  block/rbd: add iotest for rbd legacy keyvalue filename parsing
  block/rbd: add deprecation documentation for filename keyvalue pairs

block/rbd.c                | 89 ++++++++++++++++++++++++++++++++------
 qemu-deprecated.texi       | 15 +++++++
 tests/qemu-iotests/231     | 62 ++++++++++++++++++++++++++
 tests/qemu-iotests/231.out |  9 ++++
 tests/qemu-iotests/group   |  1 +
 5 files changed, 162 insertions(+), 14 deletions(-)
 create mode 100755 tests/qemu-iotests/231
 create mode 100644 tests/qemu-iotests/231.out

-- 
2.17.1

Code movement to pull the conversion from Qdict to BlockdevOptionsRbd
into a helper function.

Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Message-id: 5b49a980f2cde6610ab1df41bb0277d00b5db893.1536704901.git.jcody@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/rbd.c | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/block/rbd.c b/block/rbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -XXX,XX +XXX,XX @@ failed_opts:
     return r;
 }
 
+static int qemu_rbd_convert_options(QDict *options, BlockdevOptionsRbd **opts,
+                                    Error **errp)
+{
+    Visitor *v;
+    Error *local_err = NULL;
+
+    /* Convert the remaining options into a QAPI object */
+    v = qobject_input_visitor_new_flat_confused(options, errp);
+    if (!v) {
+        return -EINVAL;
+    }
+
+    visit_type_BlockdevOptionsRbd(v, NULL, opts, &local_err);
+    visit_free(v);
+
+    if (local_err) {
+        error_propagate(errp, local_err);
+        return -EINVAL;
+    }
+
+    return 0;
+}
+
 static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
                          Error **errp)
 {
     BDRVRBDState *s = bs->opaque;
     BlockdevOptionsRbd *opts = NULL;
-    Visitor *v;
     const QDictEntry *e;
     Error *local_err = NULL;
     char *keypairs, *secretid;
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
         qdict_del(options, "password-secret");
     }
 
-    /* Convert the remaining options into a QAPI object */
-    v = qobject_input_visitor_new_flat_confused(options, errp);
-    if (!v) {
-        r = -EINVAL;
-        goto out;
-    }
-
-    visit_type_BlockdevOptionsRbd(v, NULL, &opts, &local_err);
-    visit_free(v);
-
+    r = qemu_rbd_convert_options(options, &opts, &local_err);
     if (local_err) {
         error_propagate(errp, local_err);
-        r = -EINVAL;
         goto out;
     }
 
-- 
2.17.1

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.

We do not support mixed modern usage alongside legacy keyvalue pair
usage.

A deprecation warning has been added, although care should be taken
when actually deprecating since the impact is not limited to
commandline or qapi usage, but also opening existing images.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Message-id: 15b332e5432ad069441f7275a46080f465d789a0.1536704901.git.jcody@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/rbd.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 51 insertions(+), 2 deletions(-)

diff --git a/block/rbd.c b/block/rbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_convert_options(QDict *options, BlockdevOptionsRbd **opts,
     return 0;
 }
 
+static int qemu_rbd_attempt_legacy_options(QDict *options,
+                                           BlockdevOptionsRbd **opts,
+                                           char **keypairs)
+{
+    char *filename;
+    int r;
+
+    filename = g_strdup(qdict_get_try_str(options, "filename"));
+    if (!filename) {
+        return -EINVAL;
+    }
+    qdict_del(options, "filename");
+
+    qemu_rbd_parse_filename(filename, options, NULL);
+
+    /* keypairs freed by caller */
+    *keypairs = g_strdup(qdict_get_try_str(options, "=keyvalue-pairs"));
+    if (*keypairs) {
+        qdict_del(options, "=keyvalue-pairs");
+    }
+
+    r = qemu_rbd_convert_options(options, opts, NULL);
+
+    g_free(filename);
+    return r;
+}
+
 static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
                          Error **errp)
 {
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
 
     r = qemu_rbd_convert_options(options, &opts, &local_err);
     if (local_err) {
-        error_propagate(errp, local_err);
-        goto out;
+        /* If keypairs are present, that means some options are present in
+         * the modern option format.  Don't attempt to parse legacy option
+         * formats, as we won't support mixed usage. */
+        if (keypairs) {
+            error_propagate(errp, local_err);
+            goto out;
+        }
+
+        /* If the initial attempt to convert and process the options failed,
+         * we may be attempting to open an image file that has the rbd options
+         * 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. */
+        r = qemu_rbd_attempt_legacy_options(options, &opts, &keypairs);
+        if (r < 0) {
+            error_propagate(errp, local_err);
+            goto out;
+        }
+        /* Take care whenever deciding to actually deprecate; once this ability
+         * is removed, we will not be able to open any images with legacy-styled
+         * backing image strings. */
+        error_report("RBD options encoded in the filename as keyvalue pairs "
+                     "is deprecated.  Future versions may cease to parse "
+                     "these options in the future.");
     }
 
     /* Remove the processed options from the QDict (the visitor processes
-- 
2.17.1

This is a small test that will check for the ability to parse
both legacy and modern options for rbd.

The way the test is set up is for failure to occur, but without
having to wait to timeout on a non-existent rbd server.  The error
messages in the success path show that the arguments were parsed.

The failure behavior prior to the patch series that has this test, is
qemu-img complaining about mandatory options (e.g. 'pool') not being
provided.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Message-id: f830580e339b974a83ed4870d11adcdc17f49a47.1536704901.git.jcody@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 tests/qemu-iotests/231     | 62 ++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/231.out |  9 ++++++
 tests/qemu-iotests/group   |  1 +
 3 files changed, 72 insertions(+)
 create mode 100755 tests/qemu-iotests/231
 create mode 100644 tests/qemu-iotests/231.out

diff --git a/tests/qemu-iotests/231 b/tests/qemu-iotests/231
new file mode 100755
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/231
@@ -XXX,XX +XXX,XX @@
+#!/bin/bash
+#
+# Test legacy and modern option parsing for rbd/ceph.  This will not
+# actually connect to a ceph server, but rather looks for the appropriate
+# error message that indicates we parsed the options correctly.
+#
+# Copyright (C) 2018 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# creator
+owner=jcody@redhat.com
+
+seq=`basename $0`
+echo "QA output created by $seq"
+
+here=`pwd`
+status=1	# failure is the default!
+
+_cleanup()
+{
+    rm "${BOGUS_CONF}"
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+
+_supported_fmt generic
+_supported_proto rbd
+_supported_os Linux
+
+BOGUS_CONF=${TEST_DIR}/ceph-$$.conf
+touch "${BOGUS_CONF}"
+
+_filter_conf()
+{
+    sed -e "s#$BOGUS_CONF#BOGUS_CONF#g"
+}
+
+# We expect this to fail, with no monitor ip provided and a null conf file.  Just want it
+# to fail in the right way.
+$QEMU_IMG info "json:{'file.driver':'rbd','file.filename':'rbd:rbd/bogus:conf=${BOGUS_CONF}'}" 2>&1 | _filter_conf
+$QEMU_IMG info "json:{'file.driver':'rbd','file.pool':'rbd','file.image':'bogus','file.conf':'${BOGUS_CONF}'}" 2>&1 | _filter_conf
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/231.out b/tests/qemu-iotests/231.out
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/231.out
@@ -XXX,XX +XXX,XX @@
+QA output created by 231
+qemu-img: RBD options encoded in the filename as keyvalue pairs is deprecated.  Future versions may cease to parse these options in the future.
+unable to get monitor info from DNS SRV with service name: ceph-mon
+no monitors specified to connect to.
+qemu-img: Could not open 'json:{'file.driver':'rbd','file.filename':'rbd:rbd/bogus:conf=BOGUS_CONF'}': error connecting: No such file or directory
+unable to get monitor info from DNS SRV with service name: ceph-mon
+no monitors specified to connect to.
+qemu-img: Could not open 'json:{'file.driver':'rbd','file.pool':'rbd','file.image':'bogus','file.conf':'BOGUS_CONF'}': error connecting: No such file or directory
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -XXX,XX +XXX,XX @@
 226 auto quick
 227 auto quick
 229 auto quick
+231 auto quick
-- 
2.17.1

Signed-off-by: Jeff Cody <jcody@redhat.com>
Message-id: 647f5b5ab7efd8bf567a504c832b1d2d6f719b23.1536704901.git.jcody@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 qemu-deprecated.texi | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
index XXXXXXX..XXXXXXX 100644
--- a/qemu-deprecated.texi
+++ b/qemu-deprecated.texi
@@ -XXX,XX +XXX,XX @@ used instead.
 In order to prevent QEMU from automatically opening an image's backing
 chain, use ``"backing": null'' instead.
 
+@subsubsection rbd keyvalue pair encoded filenames: "" (since 3.1.0)
+
+Options for ``rbd'' should be specified according to its runtime options,
+like other block drivers.  Legacy parsing of keyvalue pair encoded
+filenames is useful to open images with the old format for backing files;
+These image files should be updated to use the current format.
+
+Example of legacy encoding:
+
+@code{json:@{"file.driver":"rbd", "file.filename":"rbd:rbd/name"@}}
+
+The above, converted to the current supported format:
+
+@code{json:@{"file.driver":"rbd", "file.pool":"rbd", "file.image":"name"@}}
+
 @subsection vio-spapr-device device options
 
 @subsubsection "irq": "" (since 3.0.0)
-- 
2.17.1

From: Stefano Garzarella <sgarzare@redhat.com>

Commit 1793ad0247 ("iothread: add aio-max-batch parameter") added
a new parameter (aio-max-batch) to IOThread and used PollParamInfo
structure to handle it.

Since it is not a parameter of the polling mechanism, we rename the
structure to a more generic IOThreadParamInfo.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20210727145936.147032-2-sgarzare@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 iothread.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/iothread.c b/iothread.c
index XXXXXXX..XXXXXXX 100644
--- a/iothread.c
+++ b/iothread.c
@@ -XXX,XX +XXX,XX @@ static void iothread_complete(UserCreatable *obj, Error **errp)
 typedef struct {
     const char *name;
     ptrdiff_t offset; /* field's byte offset in IOThread struct */
-} PollParamInfo;
+} IOThreadParamInfo;
 
-static PollParamInfo poll_max_ns_info = {
+static IOThreadParamInfo poll_max_ns_info = {
     "poll-max-ns", offsetof(IOThread, poll_max_ns),
 };
-static PollParamInfo poll_grow_info = {
+static IOThreadParamInfo poll_grow_info = {
     "poll-grow", offsetof(IOThread, poll_grow),
 };
-static PollParamInfo poll_shrink_info = {
+static IOThreadParamInfo poll_shrink_info = {
     "poll-shrink", offsetof(IOThread, poll_shrink),
 };
-static PollParamInfo aio_max_batch_info = {
+static IOThreadParamInfo aio_max_batch_info = {
     "aio-max-batch", offsetof(IOThread, aio_max_batch),
 };
 
@@ -XXX,XX +XXX,XX @@ static void iothread_get_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
-    PollParamInfo *info = opaque;
+    IOThreadParamInfo *info = opaque;
     int64_t *field = (void *)iothread + info->offset;
 
     visit_type_int64(v, name, field, errp);
@@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
-    PollParamInfo *info = opaque;
+    IOThreadParamInfo *info = opaque;
     int64_t *field = (void *)iothread + info->offset;
     int64_t value;
 
-- 
2.31.1

From: Stefano Garzarella <sgarzare@redhat.com>

Commit 0445409d74 ("iothread: generalize
iothread_set_param/iothread_get_param") moved common code to set and
get IOThread parameters in two new functions.

These functions are called inside callbacks, so we don't need to use an
opaque pointer. Let's replace `void *opaque` parameter with
`IOThreadParamInfo *info`.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20210727145936.147032-3-sgarzare@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 iothread.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/iothread.c b/iothread.c
index XXXXXXX..XXXXXXX 100644
--- a/iothread.c
+++ b/iothread.c
@@ -XXX,XX +XXX,XX @@ static IOThreadParamInfo aio_max_batch_info = {
 };
 
 static void iothread_get_param(Object *obj, Visitor *v,
-        const char *name, void *opaque, Error **errp)
+        const char *name, IOThreadParamInfo *info, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
-    IOThreadParamInfo *info = opaque;
     int64_t *field = (void *)iothread + info->offset;
 
     visit_type_int64(v, name, field, errp);
 }
 
 static bool iothread_set_param(Object *obj, Visitor *v,
-        const char *name, void *opaque, Error **errp)
+        const char *name, IOThreadParamInfo *info, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
-    IOThreadParamInfo *info = opaque;
     int64_t *field = (void *)iothread + info->offset;
     int64_t value;
 
@@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v,
 static void iothread_get_poll_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
+    IOThreadParamInfo *info = opaque;
 
-    iothread_get_param(obj, v, name, opaque, errp);
+    iothread_get_param(obj, v, name, info, errp);
 }
 
 static void iothread_set_poll_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
+    IOThreadParamInfo *info = opaque;
 
-    if (!iothread_set_param(obj, v, name, opaque, errp)) {
+    if (!iothread_set_param(obj, v, name, info, errp)) {
         return;
     }
 
@@ -XXX,XX +XXX,XX @@ static void iothread_set_poll_param(Object *obj, Visitor *v,
 static void iothread_get_aio_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
+    IOThreadParamInfo *info = opaque;
 
-    iothread_get_param(obj, v, name, opaque, errp);
+    iothread_get_param(obj, v, name, info, errp);
 }
 
 static void iothread_set_aio_param(Object *obj, Visitor *v,
         const char *name, void *opaque, Error **errp)
 {
     IOThread *iothread = IOTHREAD(obj);
+    IOThreadParamInfo *info = opaque;
 
-    if (!iothread_set_param(obj, v, name, opaque, errp)) {
+    if (!iothread_set_param(obj, v, name, info, errp)) {
         return;
     }
 
-- 
2.31.1