Series comparison

-[Qemu-devel] [PULL 0/4] Block patches
+[PULL 0/3] Block patches
-The following changes since commit 19b599f7664b2ebfd0f405fb79c14dd241557452:
+The following changes since commit 9c125d17e9402c232c46610802e5931b3639d77b:
-  Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2018-08-27-v2' into staging (2018-08-27 16:44:20 +0100)
+  Merge tag 'pull-tcg-20220420' of https://gitlab.com/rth7680/qemu into staging (2022-04-20 16:43:11 -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 d45c83328feab2e4083991693160f0a417cfd9b0:
-  block/rbd: add deprecation documentation for filename keyvalue pairs (2018-09-12 08:51:45 -0400)
+  virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option (2022-04-21 12:05:15 +0200)
 ----------------------------------------------------------------
-Block patches for RBD
+Pull request
 Small contrib/vhost-user-blk, contrib/vhost-user-scsi, and tools/virtiofsd
 improvements.
 ----------------------------------------------------------------
-Jeff Cody (4):
+Liu Yiding (1):
-  block/rbd: pull out qemu_rbd_convert_options
+  virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option
   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 ++++++++++++++++++++++++++++++++------
+Sakshi Kaushik (1):
- qemu-deprecated.texi       | 15 +++++++
+  Implements Backend Program conventions for vhost-user-scsi
- tests/qemu-iotests/231     | 62 ++++++++++++++++++++++++++
- tests/qemu-iotests/231.out |  9 ++++
+Stefan Hajnoczi (1):
- tests/qemu-iotests/group   |  1 +
+  contrib/vhost-user-blk: add missing GOptionEntry NULL terminator
-files changed, 162 insertions(+), 14 deletions(-)
- create mode 100755 tests/qemu-iotests/231
+ docs/tools/virtiofsd.rst                  |  5 ++
- create mode 100644 tests/qemu-iotests/231.out
+ contrib/vhost-user-blk/vhost-user-blk.c   |  3 +-
  contrib/vhost-user-scsi/vhost-user-scsi.c | 77 +++++++++++++++--------
  tools/virtiofsd/helper.c                  |  3 +
 files changed, 62 insertions(+), 26 deletions(-)
 --
-.17.1
+.35.1

-[Qemu-devel] [PULL 1/4] block/rbd: pull out qemu_rbd_convert_options
+[PULL 1/3] Implements Backend Program conventions for vhost-user-scsi
-Code movement to pull the conversion from Qdict to BlockdevOptionsRbd
+From: Sakshi Kaushik <sakshikaushik717@gmail.com>
 into a helper function.
-Reviewed-by: Eric Blake <eblake@redhat.com>
+Signed-off-by: Sakshi Kaushik <sakshikaushik717@gmail.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
+Message-id: 20220406162410.8536-1-sakshikaushik717@gmail.com
-Signed-off-by: Jeff Cody <jcody@redhat.com>
-Message-id: 5b49a980f2cde6610ab1df41bb0277d00b5db893.1536704901.git.jcody@redhat.com
+[Name the iSCSI URL long option --iscsi-uri instead of --iscsi_uri for
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+consistency, fix --fd which was rejected due to an outdated
 --socket-path check, and add missing entries[] terminator.
 --Stefan]
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block/rbd.c | 36 ++++++++++++++++++++++++------------
+ contrib/vhost-user-scsi/vhost-user-scsi.c | 77 +++++++++++++++--------
-file changed, 24 insertions(+), 12 deletions(-)
+file changed, 52 insertions(+), 25 deletions(-)
-diff --git a/block/rbd.c b/block/rbd.c
+diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/rbd.c
+--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
-+++ b/block/rbd.c
++++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
-@@ -XXX,XX +XXX,XX @@ failed_opts:
+@@ -XXX,XX +XXX,XX @@ fail:
-     return r;
- }
+ /** vhost-user-scsi **/
-+static int qemu_rbd_convert_options(QDict *options, BlockdevOptionsRbd **opts,
++static int opt_fdnum = -1;
-+                                    Error **errp)
++static char *opt_socket_path;
-+{
++static gboolean opt_print_caps;
-+    Visitor *v;
++static char *iscsi_uri;
 +    Error *local_err = NULL;
 +
-+    /* Convert the remaining options into a QAPI object */
++static GOptionEntry entries[] = {
-+    v = qobject_input_visitor_new_flat_confused(options, errp);
++    { "print-capabilities", 'c', 0, G_OPTION_ARG_NONE, &opt_print_caps,
-+    if (!v) {
++      "Print capabilities", NULL },
-+        return -EINVAL;
++    { "fd", 'f', 0, G_OPTION_ARG_INT, &opt_fdnum,
 +      "Use inherited fd socket", "FDNUM" },
 +    { "iscsi-uri", 'i', 0, G_OPTION_ARG_FILENAME, &iscsi_uri,
 +      "iSCSI URI to connect to", "FDNUM" },
 +    { "socket-path", 's', 0, G_OPTION_ARG_FILENAME, &opt_socket_path,
 +      "Use UNIX socket path", "PATH" },
 +    { NULL, }
 +};
 +
  int main(int argc, char **argv)
  {
      VusDev *vdev_scsi = NULL;
 -    char *unix_fn = NULL;
 -    char *iscsi_uri = NULL;
 -    int lsock = -1, csock = -1, opt, err = EXIT_SUCCESS;
 +    int lsock = -1, csock = -1, err = EXIT_SUCCESS;
 -    while ((opt = getopt(argc, argv, "u:i:")) != -1) {
 -        switch (opt) {
 -        case 'h':
 -            goto help;
 -        case 'u':
 -            unix_fn = g_strdup(optarg);
 -            break;
 -        case 'i':
 -            iscsi_uri = g_strdup(optarg);
 -            break;
 -        default:
 -            goto help;
 -        }
 +    GError *error = NULL;
 +    GOptionContext *context;
 +
 +    context = g_option_context_new(NULL);
 +    g_option_context_add_main_entries(context, entries, NULL);
 +    if (!g_option_context_parse(context, &argc, &argv, &error)) {
 +        g_printerr("Option parsing failed: %s\n", error->message);
 +        exit(EXIT_FAILURE);
 +    }
 +
-+    visit_type_BlockdevOptionsRbd(v, NULL, opts, &local_err);
++    if (opt_print_caps) {
-+    visit_free(v);
++        g_print("{\n");
 +        g_print("  \"type\": \"scsi\"\n");
 +        g_print("}\n");
 +        goto out;
      }
 -    if (!unix_fn || !iscsi_uri) {
 +
-+    if (local_err) {
++    if (!iscsi_uri) {
-+        error_propagate(errp, local_err);
+         goto help;
 +        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 */
+-    lsock = unix_sock_new(unix_fn);
--    v = qobject_input_visitor_new_flat_confused(options, errp);
+-    if (lsock < 0) {
--    if (!v) {
+-        goto err;
--        r = -EINVAL;
++    if (opt_socket_path) {
--        goto out;
++        lsock = unix_sock_new(opt_socket_path);
--    }
++        if (lsock < 0) {
--
++            exit(EXIT_FAILURE);
--    visit_type_BlockdevOptionsRbd(v, NULL, &opts, &local_err);
++        }
--    visit_free(v);
++    } else if (opt_fdnum < 0) {
--
++        g_print("%s\n", g_option_context_get_help(context, true, NULL));
-+    r = qemu_rbd_convert_options(options, &opts, &local_err);
++        exit(EXIT_FAILURE);
-     if (local_err) {
++    } else {
-         error_propagate(errp, local_err);
++        lsock = opt_fdnum;
 -        r = -EINVAL;
          goto out;
      }
+     csock = accept(lsock, NULL, NULL);
+@@ -XXX,XX +XXX,XX @@ out:
+     if (vdev_scsi) {
+         g_main_loop_unref(vdev_scsi->loop);
+         g_free(vdev_scsi);
+-        unlink(unix_fn);
++        unlink(opt_socket_path);
+     }
+     if (csock >= 0) {
+         close(csock);
+@@ -XXX,XX +XXX,XX @@ out:
+     if (lsock >= 0) {
+         close(lsock);
+     }
+-    g_free(unix_fn);
++    g_free(opt_socket_path);
+     g_free(iscsi_uri);
+     return err;
+@@ -XXX,XX +XXX,XX @@ err:
+     goto out;
+ help:
+-    fprintf(stderr, "Usage: %s [ -u unix_sock_path -i iscsi_uri ] | [ -h ]\n",
++    fprintf(stderr, "Usage: %s [ -s socket-path -i iscsi-uri -f fd -p print-capabilities ] | [ -h ]\n",
+             argv[0]);
+-    fprintf(stderr, "          -u path to unix socket\n");
+-    fprintf(stderr, "          -i iscsi uri for lun 0\n");
++    fprintf(stderr, "          -s, --socket-path=SOCKET_PATH path to unix socket\n");
++    fprintf(stderr, "          -i, --iscsi-uri=ISCSI_URI iscsi uri for lun 0\n");
++    fprintf(stderr, "          -f, --fd=FILE_DESCRIPTOR file-descriptor\n");
++    fprintf(stderr, "          -p, --print-capabilities=PRINT_CAPABILITIES denotes print-capabilities\n");
+     fprintf(stderr, "          -h print help and quit\n");
+     goto err;
 --
-.17.1
+.35.1

-[Qemu-devel] [PULL 4/4] block/rbd: add deprecation documentation for filename keyvalue pairs
+[PULL 2/3] contrib/vhost-user-blk: add missing GOptionEntry NULL terminator
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+The GLib documentation says "a NULL-terminated array of GOptionEntrys"
-Message-id: 647f5b5ab7efd8bf567a504c832b1d2d6f719b23.1536704901.git.jcody@redhat.com
+so we'd better make sure there is a terminator that lets
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+g_option_context_add_main_entries() know when the end of the array has
 been reached.
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
 Message-id: 20220411150057.3009667-1-stefanha@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- qemu-deprecated.texi | 15 +++++++++++++++
+ contrib/vhost-user-blk/vhost-user-blk.c | 3 ++-
-file changed, 15 insertions(+)
+file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
+diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-blk/vhost-user-blk.c
 index XXXXXXX..XXXXXXX 100644
---- a/qemu-deprecated.texi
+--- a/contrib/vhost-user-blk/vhost-user-blk.c
-+++ b/qemu-deprecated.texi
++++ b/contrib/vhost-user-blk/vhost-user-blk.c
-@@ -XXX,XX +XXX,XX @@ used instead.
+@@ -XXX,XX +XXX,XX @@ static GOptionEntry entries[] = {
- In order to prevent QEMU from automatically opening an image's backing
+     {"blk-file", 'b', 0, G_OPTION_ARG_FILENAME, &opt_blk_file,
- chain, use ``"backing": null'' instead.
+      "block device or file path", "PATH"},
+     { "read-only", 'r', 0, G_OPTION_ARG_NONE, &opt_read_only,
-+@subsubsection rbd keyvalue pair encoded filenames: "" (since 3.1.0)
+-      "Enable read-only", NULL }
-+
++      "Enable read-only", NULL },
-+Options for ``rbd'' should be specified according to its runtime options,
++    { NULL, },
-+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.
+ int main(int argc, char **argv)
 +
 +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)
 --
-.17.1
+.35.1

-[Qemu-devel] [PULL 2/4] block/rbd: Attempt to parse legacy filenames
+[PULL 3/3] virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option
-When we converted rbd to get rid of the older key/value-centric
+From: Liu Yiding <liuyd.fnst@fujitsu.com>
 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.
+virtiofsd has introduced killpriv_v2/no_killpriv_v2 for a while. Add
 description of it to docs/helper.
-If the initial attempt to parse the "proper" options fails, it assumes
+Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
-that we may have an older key/value encoded filename.  Fall back to
+Message-Id: <20220421095151.2231099-1-liuyd.fnst@fujitsu.com>
 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
+[Small documentation fixes: s/as client supports/as the client supports/
-usage.
+and s/.  /. /.
 --Stefan]
-A deprecation warning has been added, although care should be taken
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-when actually deprecating since the impact is not limited to
+---
-commandline or qapi usage, but also opening existing images.
+ docs/tools/virtiofsd.rst | 5 +++++
  tools/virtiofsd/helper.c | 3 +++
 files changed, 8 insertions(+)
-Reviewed-by: Eric Blake <eblake@redhat.com>
+diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst
 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
+--- a/docs/tools/virtiofsd.rst
-+++ b/block/rbd.c
++++ b/docs/tools/virtiofsd.rst
-@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_convert_options(QDict *options, BlockdevOptionsRbd **opts,
+@@ -XXX,XX +XXX,XX @@ Options
-     return 0;
+     label. Server will try to set that label on newly created file
      atomically wherever possible.
 +  * killpriv_v2|no_killpriv_v2 -
 +    Enable/disable ``FUSE_HANDLE_KILLPRIV_V2`` support. KILLPRIV_V2 is enabled
 +    by default as long as the client supports it. Enabling this option helps
 +    with performance in write path.
 +
  .. option:: --socket-path=PATH
    Listen on vhost-user UNIX domain socket at PATH.
 diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
 index XXXXXXX..XXXXXXX 100644
 --- a/tools/virtiofsd/helper.c
 +++ b/tools/virtiofsd/helper.c
@@ -XXX,XX +XXX,XX @@ void fuse_cmdline_help(void)
             "    -o announce_submounts      Announce sub-mount points to the guest\n"
             "    -o posix_acl/no_posix_acl  Enable/Disable posix_acl. (default: disabled)\n"
             "    -o security_label/no_security_label  Enable/Disable security label. (default: disabled)\n"
 +           "    -o killpriv_v2/no_killpriv_v2\n"
 +           "                               Enable/Disable FUSE_HANDLE_KILLPRIV_V2.\n"
 +           "                               (default: enabled as long as client supports it)\n"
             );
  }
-+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
+.35.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

The following changes since commit 9c125d17e9402c232c46610802e5931b3639d77b:

Merge tag 'pull-tcg-20220420' of https://gitlab.com/rth7680/qemu into staging (2022-04-20 16:43:11 -0700)

are available in the Git repository at:

https://gitlab.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to d45c83328feab2e4083991693160f0a417cfd9b0:

virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option (2022-04-21 12:05:15 +0200)

----------------------------------------------------------------
Pull request

Small contrib/vhost-user-blk, contrib/vhost-user-scsi, and tools/virtiofsd
improvements.

----------------------------------------------------------------

Liu Yiding (1):
  virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option

Sakshi Kaushik (1):
  Implements Backend Program conventions for vhost-user-scsi

Stefan Hajnoczi (1):
  contrib/vhost-user-blk: add missing GOptionEntry NULL terminator

docs/tools/virtiofsd.rst                  |  5 ++
 contrib/vhost-user-blk/vhost-user-blk.c   |  3 +-
 contrib/vhost-user-scsi/vhost-user-scsi.c | 77 +++++++++++++++--------
 tools/virtiofsd/helper.c                  |  3 +
 4 files changed, 62 insertions(+), 26 deletions(-)

-- 
2.35.1

From: Sakshi Kaushik <sakshikaushik717@gmail.com>

Signed-off-by: Sakshi Kaushik <sakshikaushik717@gmail.com>
Message-id: 20220406162410.8536-1-sakshikaushik717@gmail.com

[Name the iSCSI URL long option --iscsi-uri instead of --iscsi_uri for
consistency, fix --fd which was rejected due to an outdated
--socket-path check, and add missing entries[] terminator.
--Stefan]

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 contrib/vhost-user-scsi/vhost-user-scsi.c | 77 +++++++++++++++--------
 1 file changed, 52 insertions(+), 25 deletions(-)

diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index XXXXXXX..XXXXXXX 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -XXX,XX +XXX,XX @@ fail:
 
 /** vhost-user-scsi **/
 
+static int opt_fdnum = -1;
+static char *opt_socket_path;
+static gboolean opt_print_caps;
+static char *iscsi_uri;
+
+static GOptionEntry entries[] = {
+    { "print-capabilities", 'c', 0, G_OPTION_ARG_NONE, &opt_print_caps,
+      "Print capabilities", NULL },
+    { "fd", 'f', 0, G_OPTION_ARG_INT, &opt_fdnum,
+      "Use inherited fd socket", "FDNUM" },
+    { "iscsi-uri", 'i', 0, G_OPTION_ARG_FILENAME, &iscsi_uri,
+      "iSCSI URI to connect to", "FDNUM" },
+    { "socket-path", 's', 0, G_OPTION_ARG_FILENAME, &opt_socket_path,
+      "Use UNIX socket path", "PATH" },
+    { NULL, }
+};
+
 int main(int argc, char **argv)
 {
     VusDev *vdev_scsi = NULL;
-    char *unix_fn = NULL;
-    char *iscsi_uri = NULL;
-    int lsock = -1, csock = -1, opt, err = EXIT_SUCCESS;
+    int lsock = -1, csock = -1, err = EXIT_SUCCESS;
 
-    while ((opt = getopt(argc, argv, "u:i:")) != -1) {
-        switch (opt) {
-        case 'h':
-            goto help;
-        case 'u':
-            unix_fn = g_strdup(optarg);
-            break;
-        case 'i':
-            iscsi_uri = g_strdup(optarg);
-            break;
-        default:
-            goto help;
-        }
+    GError *error = NULL;
+    GOptionContext *context;
+
+    context = g_option_context_new(NULL);
+    g_option_context_add_main_entries(context, entries, NULL);
+    if (!g_option_context_parse(context, &argc, &argv, &error)) {
+        g_printerr("Option parsing failed: %s\n", error->message);
+        exit(EXIT_FAILURE);
+    }
+
+    if (opt_print_caps) {
+        g_print("{\n");
+        g_print("  \"type\": \"scsi\"\n");
+        g_print("}\n");
+        goto out;
     }
-    if (!unix_fn || !iscsi_uri) {
+
+    if (!iscsi_uri) {
         goto help;
     }
 
-    lsock = unix_sock_new(unix_fn);
-    if (lsock < 0) {
-        goto err;
+    if (opt_socket_path) {
+        lsock = unix_sock_new(opt_socket_path);
+        if (lsock < 0) {
+            exit(EXIT_FAILURE);
+        }
+    } else if (opt_fdnum < 0) {
+        g_print("%s\n", g_option_context_get_help(context, true, NULL));
+        exit(EXIT_FAILURE);
+    } else {
+        lsock = opt_fdnum;
     }
 
     csock = accept(lsock, NULL, NULL);
@@ -XXX,XX +XXX,XX @@ out:
     if (vdev_scsi) {
         g_main_loop_unref(vdev_scsi->loop);
         g_free(vdev_scsi);
-        unlink(unix_fn);
+        unlink(opt_socket_path);
     }
     if (csock >= 0) {
         close(csock);
@@ -XXX,XX +XXX,XX @@ out:
     if (lsock >= 0) {
         close(lsock);
     }
-    g_free(unix_fn);
+    g_free(opt_socket_path);
     g_free(iscsi_uri);
 
     return err;
@@ -XXX,XX +XXX,XX @@ err:
     goto out;
 
 help:
-    fprintf(stderr, "Usage: %s [ -u unix_sock_path -i iscsi_uri ] | [ -h ]\n",
+    fprintf(stderr, "Usage: %s [ -s socket-path -i iscsi-uri -f fd -p print-capabilities ] | [ -h ]\n",
             argv[0]);
-    fprintf(stderr, "          -u path to unix socket\n");
-    fprintf(stderr, "          -i iscsi uri for lun 0\n");
+    fprintf(stderr, "          -s, --socket-path=SOCKET_PATH path to unix socket\n");
+    fprintf(stderr, "          -i, --iscsi-uri=ISCSI_URI iscsi uri for lun 0\n");
+    fprintf(stderr, "          -f, --fd=FILE_DESCRIPTOR file-descriptor\n");
+    fprintf(stderr, "          -p, --print-capabilities=PRINT_CAPABILITIES denotes print-capabilities\n");
     fprintf(stderr, "          -h print help and quit\n");
 
     goto err;
-- 
2.35.1

The GLib documentation says "a NULL-terminated array of GOptionEntrys"
so we'd better make sure there is a terminator that lets
g_option_context_add_main_entries() know when the end of the array has
been reached.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 20220411150057.3009667-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 contrib/vhost-user-blk/vhost-user-blk.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-blk/vhost-user-blk.c
index XXXXXXX..XXXXXXX 100644
--- a/contrib/vhost-user-blk/vhost-user-blk.c
+++ b/contrib/vhost-user-blk/vhost-user-blk.c
@@ -XXX,XX +XXX,XX @@ static GOptionEntry entries[] = {
     {"blk-file", 'b', 0, G_OPTION_ARG_FILENAME, &opt_blk_file,
      "block device or file path", "PATH"},
     { "read-only", 'r', 0, G_OPTION_ARG_NONE, &opt_read_only,
-      "Enable read-only", NULL }
+      "Enable read-only", NULL },
+    { NULL, },
 };
 
 int main(int argc, char **argv)
-- 
2.35.1

From: Liu Yiding <liuyd.fnst@fujitsu.com>

virtiofsd has introduced killpriv_v2/no_killpriv_v2 for a while. Add
description of it to docs/helper.

Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
Message-Id: <20220421095151.2231099-1-liuyd.fnst@fujitsu.com>

[Small documentation fixes: s/as client supports/as the client supports/
and s/.  /. /.
--Stefan]

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 docs/tools/virtiofsd.rst | 5 +++++
 tools/virtiofsd/helper.c | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst
index XXXXXXX..XXXXXXX 100644
--- a/docs/tools/virtiofsd.rst
+++ b/docs/tools/virtiofsd.rst
@@ -XXX,XX +XXX,XX @@ Options
     label. Server will try to set that label on newly created file
     atomically wherever possible.
 
+  * killpriv_v2|no_killpriv_v2 -
+    Enable/disable ``FUSE_HANDLE_KILLPRIV_V2`` support. KILLPRIV_V2 is enabled
+    by default as long as the client supports it. Enabling this option helps
+    with performance in write path.
+
 .. option:: --socket-path=PATH
 
   Listen on vhost-user UNIX domain socket at PATH.
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
index XXXXXXX..XXXXXXX 100644
--- a/tools/virtiofsd/helper.c
+++ b/tools/virtiofsd/helper.c
@@ -XXX,XX +XXX,XX @@ void fuse_cmdline_help(void)
            "    -o announce_submounts      Announce sub-mount points to the guest\n"
            "    -o posix_acl/no_posix_acl  Enable/Disable posix_acl. (default: disabled)\n"
            "    -o security_label/no_security_label  Enable/Disable security label. (default: disabled)\n"
+           "    -o killpriv_v2/no_killpriv_v2\n"
+           "                               Enable/Disable FUSE_HANDLE_KILLPRIV_V2.\n"
+           "                               (default: enabled as long as client supports it)\n"
            );
 }
 
-- 
2.35.1