Series comparison

-[PULL 0/4] Block patches
+[PULL 0/3] Block patches
-The following changes since commit 8cb41fda78c7ebde0dd248c6afe1d336efb0de50:
+The following changes since commit 9c125d17e9402c232c46610802e5931b3639d77b:
-  Merge remote-tracking branch 'remotes/philmd/tags/machine-20211101' into staging (2021-11-02 05:53:45 -0400)
+  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://github.com/XanClic/qemu.git tags/pull-block-2021-11-02
+  https://gitlab.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 7da9623cc078229caf07c290e16401ccdb9408d2:
+for you to fetch changes up to d45c83328feab2e4083991693160f0a417cfd9b0:
-  block/vpc: Add a sanity check that fixed-size images have the right type (2021-11-02 12:47:51 +0100)
+  virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option (2022-04-21 12:05:15 +0200)
 ----------------------------------------------------------------
-Emanuele Giuseppe Esposito (1):
+Pull request
   pylint: fix errors and warnings generated by tests/qemu-iotests/297
-Eric Blake (1):
+Small contrib/vhost-user-blk, contrib/vhost-user-scsi, and tools/virtiofsd
-  qemu-img: Consistent docs for convert -F
+improvements.
-Thomas Huth (1):
+----------------------------------------------------------------
   block/vpc: Add a sanity check that fixed-size images have the right
     type
-Thomas Weißschuh (1):
+Liu Yiding (1):
-  vmdk: allow specification of tools version
+  virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option
- docs/tools/qemu-img.rst                 |  2 +-
+Sakshi Kaushik (1):
- qapi/block-core.json                    |  3 +++
+  Implements Backend Program conventions for vhost-user-scsi
- block/vmdk.c                            | 24 ++++++++++++++++++++----
- block/vpc.c                             |  3 ++-
+Stefan Hajnoczi (1):
- qemu-img-cmds.hx                        |  2 +-
+  contrib/vhost-user-blk: add missing GOptionEntry NULL terminator
- tests/qemu-iotests/129                  | 18 +++++++++---------
- tests/qemu-iotests/310                  | 16 ++++++++--------
+ docs/tools/virtiofsd.rst                  |  5 ++
- tests/qemu-iotests/check                | 11 ++++++-----
+ contrib/vhost-user-blk/vhost-user-blk.c   |  3 +-
- tests/qemu-iotests/iotests.py           |  7 ++++---
+ contrib/vhost-user-scsi/vhost-user-scsi.c | 77 +++++++++++++++--------
- tests/qemu-iotests/tests/image-fleecing |  4 ++--
+ tools/virtiofsd/helper.c                  |  3 +
-files changed, 56 insertions(+), 34 deletions(-)
+files changed, 62 insertions(+), 26 deletions(-)
 --
-.31.1
+.35.1

-[PULL 1/4] qemu-img: Consistent docs for convert -F
+Deleted patch
-From: Eric Blake <eblake@redhat.com>
-Use consistent capitalization, and fix a missed line (we duplicate the
-qemu-img synopses in too many places).
-Fixes: 1899bf4737 (qemu-img: Add -F shorthand to convert)
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Message-Id: <20210921142812.2631605-1-eblake@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Signed-off-by: Hanna Reitz <hreitz@redhat.com>
----
- docs/tools/qemu-img.rst | 2 +-
- qemu-img-cmds.hx        | 2 +-
-files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst
-index XXXXXXX..XXXXXXX 100644
---- a/docs/tools/qemu-img.rst
-+++ b/docs/tools/qemu-img.rst
-@@ -XXX,XX +XXX,XX @@ Command description:
-     Error on reading data
--.. option:: convert [--object OBJECTDEF] [--image-opts] [--target-image-opts] [--target-is-zero] [--bitmaps [--skip-broken-bitmaps]] [-U] [-C] [-c] [-p] [-q] [-n] [-f FMT] [-t CACHE] [-T SRC_CACHE] [-O OUTPUT_FMT] [-B BACKING_FILE [-F backing_fmt]] [-o OPTIONS] [-l SNAPSHOT_PARAM] [-S SPARSE_SIZE] [-r RATE_LIMIT] [-m NUM_COROUTINES] [-W] FILENAME [FILENAME2 [...]] OUTPUT_FILENAME
-+.. option:: convert [--object OBJECTDEF] [--image-opts] [--target-image-opts] [--target-is-zero] [--bitmaps [--skip-broken-bitmaps]] [-U] [-C] [-c] [-p] [-q] [-n] [-f FMT] [-t CACHE] [-T SRC_CACHE] [-O OUTPUT_FMT] [-B BACKING_FILE [-F BACKING_FMT]] [-o OPTIONS] [-l SNAPSHOT_PARAM] [-S SPARSE_SIZE] [-r RATE_LIMIT] [-m NUM_COROUTINES] [-W] FILENAME [FILENAME2 [...]] OUTPUT_FILENAME
-   Convert the disk image *FILENAME* or a snapshot *SNAPSHOT_PARAM*
-   to disk image *OUTPUT_FILENAME* using format *OUTPUT_FMT*. It can
-diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
-index XXXXXXX..XXXXXXX 100644
---- a/qemu-img-cmds.hx
-+++ b/qemu-img-cmds.hx
-@@ -XXX,XX +XXX,XX @@ ERST
- DEF("convert", img_convert,
-     "convert [--object objectdef] [--image-opts] [--target-image-opts] [--target-is-zero] [--bitmaps] [-U] [-C] [-c] [-p] [-q] [-n] [-f fmt] [-t cache] [-T src_cache] [-O output_fmt] [-B backing_file [-F backing_fmt]] [-o options] [-l snapshot_param] [-S sparse_size] [-r rate_limit] [-m num_coroutines] [-W] [--salvage] filename [filename2 [...]] output_filename")
- SRST
--.. option:: convert [--object OBJECTDEF] [--image-opts] [--target-image-opts] [--target-is-zero] [--bitmaps] [-U] [-C] [-c] [-p] [-q] [-n] [-f FMT] [-t CACHE] [-T SRC_CACHE] [-O OUTPUT_FMT] [-B BACKING_FILE] [-o OPTIONS] [-l SNAPSHOT_PARAM] [-S SPARSE_SIZE] [-r RATE_LIMIT] [-m NUM_COROUTINES] [-W] [--salvage] FILENAME [FILENAME2 [...]] OUTPUT_FILENAME
-+.. option:: convert [--object OBJECTDEF] [--image-opts] [--target-image-opts] [--target-is-zero] [--bitmaps] [-U] [-C] [-c] [-p] [-q] [-n] [-f FMT] [-t CACHE] [-T SRC_CACHE] [-O OUTPUT_FMT] [-B BACKING_FILE [-F BACKING_FMT]] [-o OPTIONS] [-l SNAPSHOT_PARAM] [-S SPARSE_SIZE] [-r RATE_LIMIT] [-m NUM_COROUTINES] [-W] [--salvage] FILENAME [FILENAME2 [...]] OUTPUT_FILENAME
- ERST
- DEF("create", img_create,
---
-.31.1

-[PULL 3/4] vmdk: allow specification of tools version
+[PULL 1/3] Implements Backend Program conventions for vhost-user-scsi
-From: Thomas Weißschuh <thomas.weissschuh.ext@zeiss.com>
+From: Sakshi Kaushik <sakshikaushik717@gmail.com>
-VMDK files support an attribute that represents the version of the guest
+Signed-off-by: Sakshi Kaushik <sakshikaushik717@gmail.com>
-tools that are installed on the disk.
+Message-id: 20220406162410.8536-1-sakshikaushik717@gmail.com
 This attribute is used by vSphere before a machine has been started to
 determine if the VM has the guest tools installed.
 This is important when configuring "Operating system customizations" in
 vSphere, as it checks for the presence of the guest tools before
 allowing those customizations.
 Thus when the VM has not yet booted normally it would be impossible to
 customize it, therefore preventing a customized first-boot.
-The attribute should not hurt on disks that do not have the guest tools
+[Name the iSCSI URL long option --iscsi-uri instead of --iscsi_uri for
-installed and indeed the VMware tools also unconditionally add this
+consistency, fix --fd which was rejected due to an outdated
-attribute.
+--socket-path check, and add missing entries[] terminator.
-(Defaulting to the value "2147483647", as is done in this patch)
+--Stefan]
-Signed-off-by: Thomas Weißschuh <thomas.weissschuh.ext@zeiss.com>
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-Id: <20210913130419.13241-1-thomas.weissschuh.ext@zeiss.com>
 [hreitz: Added missing '#' in block-core.json]
 Signed-off-by: Hanna Reitz <hreitz@redhat.com>
 ---
- qapi/block-core.json |  3 +++
+ contrib/vhost-user-scsi/vhost-user-scsi.c | 77 +++++++++++++++--------
- block/vmdk.c         | 24 ++++++++++++++++++++----
+file changed, 52 insertions(+), 25 deletions(-)
 files changed, 23 insertions(+), 4 deletions(-)
-diff --git a/qapi/block-core.json b/qapi/block-core.json
+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/qapi/block-core.json
+--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
-+++ b/qapi/block-core.json
++++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ fail:
- # @adapter-type: The adapter type used to fill in the descriptor. Default: ide.
- # @hwversion: Hardware version. The meaningful options are "4" or "6".
+ /** vhost-user-scsi **/
- #             Default: "4".
-+# @toolsversion: VMware guest tools version.
++static int opt_fdnum = -1;
-+#                Default: "2147483647" (Since 6.2)
++static char *opt_socket_path;
- # @zeroed-grain: Whether to enable zeroed-grain feature for sparse subformats.
++static gboolean opt_print_caps;
- #                Default: false.
++static char *iscsi_uri;
- #
++
-@@ -XXX,XX +XXX,XX @@
++static GOptionEntry entries[] = {
-             '*backing-file':    'str',
++    { "print-capabilities", 'c', 0, G_OPTION_ARG_NONE, &opt_print_caps,
-             '*adapter-type':    'BlockdevVmdkAdapterType',
++      "Print capabilities", NULL },
-             '*hwversion':       'str',
++    { "fd", 'f', 0, G_OPTION_ARG_INT, &opt_fdnum,
-+            '*toolsversion':    'str',
++      "Use inherited fd socket", "FDNUM" },
-             '*zeroed-grain':    'bool' } }
++    { "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,
-diff --git a/block/vmdk.c b/block/vmdk.c
++      "Use UNIX socket path", "PATH" },
-index XXXXXXX..XXXXXXX 100644
++    { NULL, }
---- a/block/vmdk.c
++};
-+++ b/block/vmdk.c
++
-@@ -XXX,XX +XXX,XX @@
+ int main(int argc, char **argv)
- #define VMDK_ZEROED  (-3)
+ {
+     VusDev *vdev_scsi = NULL;
- #define BLOCK_OPT_ZEROED_GRAIN "zeroed_grain"
+-    char *unix_fn = NULL;
-+#define BLOCK_OPT_TOOLSVERSION "toolsversion"
+-    char *iscsi_uri = NULL;
+-    int lsock = -1, csock = -1, opt, err = EXIT_SUCCESS;
- typedef struct {
++    int lsock = -1, csock = -1, err = EXIT_SUCCESS;
-     uint32_t version;
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_do_create(int64_t size,
+-    while ((opt = getopt(argc, argv, "u:i:")) != -1) {
-                                           BlockdevVmdkAdapterType adapter_type,
+-        switch (opt) {
-                                           const char *backing_file,
+-        case 'h':
-                                           const char *hw_version,
+-            goto help;
-+                                          const char *toolsversion,
+-        case 'u':
-                                           bool compat6,
+-            unix_fn = g_strdup(optarg);
-                                           bool zeroed_grain,
+-            break;
-                                           vmdk_create_extent_fn extent_fn,
+-        case 'i':
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_do_create(int64_t size,
+-            iscsi_uri = g_strdup(optarg);
-         "ddb.geometry.cylinders = \"%" PRId64 "\"\n"
+-            break;
-         "ddb.geometry.heads = \"%" PRIu32 "\"\n"
+-        default:
-         "ddb.geometry.sectors = \"63\"\n"
+-            goto help;
--        "ddb.adapterType = \"%s\"\n";
+-        }
-+        "ddb.adapterType = \"%s\"\n"
++    GError *error = NULL;
-+        "ddb.toolsVersion = \"%s\"\n";
++    GOptionContext *context;
++
-     ext_desc_lines = g_string_new(NULL);
++    context = g_option_context_new(NULL);
++    g_option_context_add_main_entries(context, entries, NULL);
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_do_create(int64_t size,
++    if (!g_option_context_parse(context, &argc, &argv, &error)) {
-     if (!hw_version) {
++        g_printerr("Option parsing failed: %s\n", error->message);
-         hw_version = "4";
++        exit(EXIT_FAILURE);
 +    }
 +
 +    if (opt_print_caps) {
 +        g_print("{\n");
 +        g_print("  \"type\": \"scsi\"\n");
 +        g_print("}\n");
 +        goto out;
      }
-+    if (!toolsversion) {
+-    if (!unix_fn || !iscsi_uri) {
-+        toolsversion = "2147483647";
++
-+    }
++    if (!iscsi_uri) {
+         goto help;
-     if (adapter_type != BLOCKDEV_VMDK_ADAPTER_TYPE_IDE) {
+     }
-         /* that's the number of heads with which vmware operates when
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_do_create(int64_t size,
+-    lsock = unix_sock_new(unix_fn);
-                            size /
+-    if (lsock < 0) {
-                                (int64_t)(63 * number_heads * BDRV_SECTOR_SIZE),
+-        goto err;
-                            number_heads,
++    if (opt_socket_path) {
--                           BlockdevVmdkAdapterType_str(adapter_type));
++        lsock = unix_sock_new(opt_socket_path);
-+                           BlockdevVmdkAdapterType_str(adapter_type),
++        if (lsock < 0) {
-+                           toolsversion);
++            exit(EXIT_FAILURE);
-     desc_len = strlen(desc);
++        }
-     /* the descriptor offset = 0x200 */
++    } else if (opt_fdnum < 0) {
-     if (!split && !flat) {
++        g_print("%s\n", g_option_context_get_help(context, true, NULL));
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_create_opts(BlockDriver *drv,
++        exit(EXIT_FAILURE);
-     BlockdevVmdkAdapterType adapter_type_enum;
++    } else {
-     char *backing_file = NULL;
++        lsock = opt_fdnum;
-     char *hw_version = NULL;
+     }
-+    char *toolsversion = NULL;
-     char *fmt = NULL;
+     csock = accept(lsock, NULL, NULL);
-     BlockdevVmdkSubformat subformat;
+@@ -XXX,XX +XXX,XX @@ out:
-     int ret = 0;
+     if (vdev_scsi) {
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_create_opts(BlockDriver *drv,
+         g_main_loop_unref(vdev_scsi->loop);
-     adapter_type = qemu_opt_get_del(opts, BLOCK_OPT_ADAPTER_TYPE);
+         g_free(vdev_scsi);
-     backing_file = qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FILE);
+-        unlink(unix_fn);
-     hw_version = qemu_opt_get_del(opts, BLOCK_OPT_HWVERSION);
++        unlink(opt_socket_path);
-+    toolsversion = qemu_opt_get_del(opts, BLOCK_OPT_TOOLSVERSION);
+     }
-     compat6 = qemu_opt_get_bool_del(opts, BLOCK_OPT_COMPAT6, false);
+     if (csock >= 0) {
-     if (strcmp(hw_version, "undefined") == 0) {
+         close(csock);
-         g_free(hw_version);
+@@ -XXX,XX +XXX,XX @@ out:
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_create_opts(BlockDriver *drv,
+     if (lsock >= 0) {
-         .opts = opts,
+         close(lsock);
-     };
+     }
-     ret = vmdk_co_do_create(total_size, subformat, adapter_type_enum,
+-    g_free(unix_fn);
--                            backing_file, hw_version, compat6, zeroed_grain,
++    g_free(opt_socket_path);
--                            vmdk_co_create_opts_cb, &data, errp);
+     g_free(iscsi_uri);
-+                            backing_file, hw_version, toolsversion, compat6,
-+                            zeroed_grain, vmdk_co_create_opts_cb, &data, errp);
+     return err;
+@@ -XXX,XX +XXX,XX @@ err:
- exit:
+     goto out;
-     g_free(backing_fmt);
-     g_free(adapter_type);
+ help:
-     g_free(backing_file);
+-    fprintf(stderr, "Usage: %s [ -u unix_sock_path -i iscsi_uri ] | [ -h ]\n",
-     g_free(hw_version);
++    fprintf(stderr, "Usage: %s [ -s socket-path -i iscsi-uri -f fd -p print-capabilities ] | [ -h ]\n",
-+    g_free(toolsversion);
+             argv[0]);
-     g_free(fmt);
+-    fprintf(stderr, "          -u path to unix socket\n");
-     g_free(desc);
+-    fprintf(stderr, "          -i iscsi uri for lun 0\n");
-     g_free(path);
++    fprintf(stderr, "          -s, --socket-path=SOCKET_PATH path to unix socket\n");
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_create(BlockdevCreateOptions *create_options,
++    fprintf(stderr, "          -i, --iscsi-uri=ISCSI_URI iscsi uri for lun 0\n");
-                             opts->adapter_type,
++    fprintf(stderr, "          -f, --fd=FILE_DESCRIPTOR file-descriptor\n");
-                             opts->backing_file,
++    fprintf(stderr, "          -p, --print-capabilities=PRINT_CAPABILITIES denotes print-capabilities\n");
-                             opts->hwversion,
+     fprintf(stderr, "          -h print help and quit\n");
-+                            opts->toolsversion,
-                             false,
+     goto err;
                              opts->zeroed_grain,
                              vmdk_co_create_cb,
@@ -XXX,XX +XXX,XX @@ static QemuOptsList vmdk_create_opts = {
              .help = "VMDK hardware version",
              .def_value_str = "undefined"
          },
 +        {
 +            .name = BLOCK_OPT_TOOLSVERSION,
 +            .type = QEMU_OPT_STRING,
 +            .help = "VMware guest tools version",
 +        },
          {
              .name = BLOCK_OPT_SUBFMT,
              .type = QEMU_OPT_STRING,
 --
-.31.1
+.35.1

-[PULL 4/4] block/vpc: Add a sanity check that fixed-size images have the right type
+[PULL 2/3] contrib/vhost-user-blk: add missing GOptionEntry NULL terminator
-From: Thomas Huth <thuth@redhat.com>
+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.
-The code in vpc.c uses BDRVVPCState->footer.type in various places
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-to decide whether the image is a fixed-size (VHD_FIXED) or a dynamic
+Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-(VHD_DYNAMIC) image. However, we never check that this field really
+Message-id: 20220411150057.3009667-1-stefanha@redhat.com
-contains VHD_FIXED if we detected a fixed size image in vpc_open(),
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 so a wrong value here could cause quite some trouble during runtime.
 Suggested-by: Kevin Wolf <kwolf@redhat.com>
 Signed-off-by: Thomas Huth <thuth@redhat.com>
 Message-Id: <20211012082702.792259-1-thuth@redhat.com>
 Signed-off-by: Hanna Reitz <hreitz@redhat.com>
 ---
- block/vpc.c | 3 ++-
+ contrib/vhost-user-blk/vhost-user-blk.c | 3 ++-
 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/block/vpc.c b/block/vpc.c
+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/block/vpc.c
+--- a/contrib/vhost-user-blk/vhost-user-blk.c
-+++ b/block/vpc.c
++++ b/contrib/vhost-user-blk/vhost-user-blk.c
-@@ -XXX,XX +XXX,XX @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags,
+@@ -XXX,XX +XXX,XX @@ static GOptionEntry entries[] = {
-         if (ret < 0) {
+     {"blk-file", 'b', 0, G_OPTION_ARG_FILENAME, &opt_blk_file,
-             goto fail;
+      "block device or file path", "PATH"},
-         }
+     { "read-only", 'r', 0, G_OPTION_ARG_NONE, &opt_read_only,
--        if (strncmp(footer->creator, "conectix", 8)) {
+-      "Enable read-only", NULL }
-+        if (strncmp(footer->creator, "conectix", 8) ||
++      "Enable read-only", NULL },
-+            be32_to_cpu(footer->type) != VHD_FIXED) {
++    { NULL, },
-             error_setg(errp, "invalid VPC image");
+ };
-             ret = -EINVAL;
-             goto fail;
+ int main(int argc, char **argv)
 --
-.31.1
+.35.1

-[PULL 2/4] pylint: fix errors and warnings generated by tests/qemu-iotests/297
+[PULL 3/3] virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+From: Liu Yiding <liuyd.fnst@fujitsu.com>
-Test 297 in tests/qemu-iotests currently fails: pylint has
+virtiofsd has introduced killpriv_v2/no_killpriv_v2 for a while. Add
-learned new things to check, or we simply missed them.
+description of it to docs/helper.
-All fixes in this patch are related to additional spaces used
+Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
-or wrong indentation. No functional change intended.
+Message-Id: <20220421095151.2231099-1-liuyd.fnst@fujitsu.com>
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+[Small documentation fixes: s/as client supports/as the client supports/
-Message-Id: <20211008062821.1010967-2-eesposit@redhat.com>
+and s/.  /. /.
-Signed-off-by: Hanna Reitz <hreitz@redhat.com>
+--Stefan]
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- tests/qemu-iotests/129                  | 18 +++++++++---------
+ docs/tools/virtiofsd.rst | 5 +++++
- tests/qemu-iotests/310                  | 16 ++++++++--------
+ tools/virtiofsd/helper.c | 3 +++
- tests/qemu-iotests/check                | 11 ++++++-----
+files changed, 8 insertions(+)
  tests/qemu-iotests/iotests.py           |  7 ++++---
  tests/qemu-iotests/tests/image-fleecing |  4 ++--
 files changed, 29 insertions(+), 27 deletions(-)
-diff --git a/tests/qemu-iotests/129 b/tests/qemu-iotests/129
+diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/129
 +++ b/tests/qemu-iotests/129
@@ -XXX,XX +XXX,XX @@ class TestStopWithBlockJob(iotests.QMPTestCase):
          self.do_test_stop("drive-backup", device="drive0",
                            target=self.target_img, format=iotests.imgfmt,
                            sync="full",
 -                          x_perf={ 'max-chunk': 65536,
 -                                   'max-workers': 8 })
 +                          x_perf={'max-chunk': 65536,
 +                                  'max-workers': 8})
      def test_block_commit(self):
          # Add overlay above the source node so that we actually use a
@@ -XXX,XX +XXX,XX @@ class TestStopWithBlockJob(iotests.QMPTestCase):
                           '1G')
          result = self.vm.qmp('blockdev-add', **{
 -                                 'node-name': 'overlay',
 -                                 'driver': iotests.imgfmt,
 -                                 'file': {
 -                                     'driver': 'file',
 -                                     'filename': self.overlay_img
 -                                 }
 -                             })
 +            'node-name': 'overlay',
 +            'driver': iotests.imgfmt,
 +            'file': {
 +                'driver': 'file',
 +                'filename': self.overlay_img
 +            }
 +        })
          self.assert_qmp(result, 'return', {})
          result = self.vm.qmp('blockdev-snapshot',
 diff --git a/tests/qemu-iotests/310 b/tests/qemu-iotests/310
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/310
 +++ b/tests/qemu-iotests/310
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('base.img') as base_img_path, \
      assert qemu_io_silent(base_img_path, '-c', 'write -P 1 3M 1M') == 0
      assert qemu_img('create', '-f', iotests.imgfmt, '-b', base_img_path,
                      '-F', iotests.imgfmt, mid_img_path) == 0
 -    assert qemu_io_silent(mid_img_path,  '-c', 'write -P 3 2M 1M') == 0
 -    assert qemu_io_silent(mid_img_path,  '-c', 'write -P 3 4M 1M') == 0
 +    assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 2M 1M') == 0
 +    assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 4M 1M') == 0
      assert qemu_img('create', '-f', iotests.imgfmt, '-b', mid_img_path,
                      '-F', iotests.imgfmt, top_img_path) == 0
 -    assert qemu_io_silent(top_img_path,  '-c', 'write -P 2 1M 1M') == 0
 +    assert qemu_io_silent(top_img_path, '-c', 'write -P 2 1M 1M') == 0
  #      0 1 2 3 4
  # top    2
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('base.img') as base_img_path, \
      assert qemu_img('rebase', '-u', '-b', '', '-f', iotests.imgfmt,
                      top_img_path) == 0
 -    assert qemu_io_silent(top_img_path,  '-c', 'read -P 0 0 1M') == 0
 -    assert qemu_io_silent(top_img_path,  '-c', 'read -P 2 1M 1M') == 0
 -    assert qemu_io_silent(top_img_path,  '-c', 'read -P 3 2M 1M') == 0
 -    assert qemu_io_silent(top_img_path,  '-c', 'read -P 0 3M 1M') == 0
 -    assert qemu_io_silent(top_img_path,  '-c', 'read -P 3 4M 1M') == 0
 +    assert qemu_io_silent(top_img_path, '-c', 'read -P 0 0 1M') == 0
 +    assert qemu_io_silent(top_img_path, '-c', 'read -P 2 1M 1M') == 0
 +    assert qemu_io_silent(top_img_path, '-c', 'read -P 3 2M 1M') == 0
 +    assert qemu_io_silent(top_img_path, '-c', 'read -P 0 3M 1M') == 0
 +    assert qemu_io_silent(top_img_path, '-c', 'read -P 3 4M 1M') == 0
      log('Done')
 diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/check
 +++ b/tests/qemu-iotests/check
@@ -XXX,XX +XXX,XX @@ def make_argparser() -> argparse.ArgumentParser:
      p.add_argument('-d', dest='debug', action='store_true', help='debug')
      p.add_argument('-p', dest='print', action='store_true',
 -                help='redirects qemu\'s stdout and stderr to the test output')
 +                   help='redirects qemu\'s stdout and stderr to '
 +                        'the test output')
      p.add_argument('-gdb', action='store_true',
 -                   help="start gdbserver with $GDB_OPTIONS options \
 -                        ('localhost:12345' if $GDB_OPTIONS is empty)")
 +                   help="start gdbserver with $GDB_OPTIONS options "
 +                        "('localhost:12345' if $GDB_OPTIONS is empty)")
      p.add_argument('-valgrind', action='store_true',
 -                    help='use valgrind, sets VALGRIND_QEMU environment '
 -                    'variable')
 +                   help='use valgrind, sets VALGRIND_QEMU environment '
 +                        'variable')
      p.add_argument('-misalign', action='store_true',
                     help='misalign memory allocations')
 diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/iotests.py
+--- a/docs/tools/virtiofsd.rst
-+++ b/tests/qemu-iotests/iotests.py
++++ b/docs/tools/virtiofsd.rst
-@@ -XXX,XX +XXX,XX @@ def _post_shutdown(self) -> None:
+@@ -XXX,XX +XXX,XX @@ Options
-         super()._post_shutdown()
+     label. Server will try to set that label on newly created file
-         if not qemu_valgrind or not self._popen:
+     atomically wherever possible.
-             return
--        valgrind_filename =  f"{test_dir}/{self._popen.pid}.valgrind"
++  * killpriv_v2|no_killpriv_v2 -
-+        valgrind_filename = f"{test_dir}/{self._popen.pid}.valgrind"
++    Enable/disable ``FUSE_HANDLE_KILLPRIV_V2`` support. KILLPRIV_V2 is enabled
-         if self.exitcode() == 99:
++    by default as long as the client supports it. Enabling this option helps
-             with open(valgrind_filename, encoding='utf-8') as f:
++    with performance in write path.
-                 print(f.read())
++
-@@ -XXX,XX +XXX,XX @@ def write(self, arg=None):
+ .. option:: --socket-path=PATH
- class ReproducibleTestRunner(unittest.TextTestRunner):
+   Listen on vhost-user UNIX domain socket at PATH.
-     def __init__(self, stream: Optional[TextIO] = None,
+diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
--             resultclass: Type[unittest.TestResult] = ReproducibleTestResult,
+index XXXXXXX..XXXXXXX 100644
--             **kwargs: Any) -> None:
+--- a/tools/virtiofsd/helper.c
-+                 resultclass: Type[unittest.TestResult] =
++++ b/tools/virtiofsd/helper.c
-+                 ReproducibleTestResult,
+@@ -XXX,XX +XXX,XX @@ void fuse_cmdline_help(void)
-+                 **kwargs: Any) -> None:
+            "    -o announce_submounts      Announce sub-mount points to the guest\n"
-         rstream = ReproducibleStreamWrapper(stream or sys.stdout)
+            "    -o posix_acl/no_posix_acl  Enable/Disable posix_acl. (default: disabled)\n"
-         super().__init__(stream=rstream,           # type: ignore
+            "    -o security_label/no_security_label  Enable/Disable security label. (default: disabled)\n"
-                          descriptions=True,
++           "    -o killpriv_v2/no_killpriv_v2\n"
-diff --git a/tests/qemu-iotests/tests/image-fleecing b/tests/qemu-iotests/tests/image-fleecing
++           "                               Enable/Disable FUSE_HANDLE_KILLPRIV_V2.\n"
-index XXXXXXX..XXXXXXX 100755
++           "                               (default: enabled as long as client supports it)\n"
---- a/tests/qemu-iotests/tests/image-fleecing
+            );
-+++ b/tests/qemu-iotests/tests/image-fleecing
+ }
@@ -XXX,XX +XXX,XX @@ def do_test(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm):
      nbd_uri = 'nbd+unix:///%s?socket=%s' % (tmp_node, nbd_sock_path)
      log(vm.qmp('nbd-server-start',
 -               {'addr': { 'type': 'unix',
 -                          'data': { 'path': nbd_sock_path } } }))
 +               {'addr': {'type': 'unix',
 +                         'data': {'path': nbd_sock_path}}}))
      log(vm.qmp('nbd-server-add', device=tmp_node))
 --
-.31.1
+.35.1

The following changes since commit 8cb41fda78c7ebde0dd248c6afe1d336efb0de50:

Merge remote-tracking branch 'remotes/philmd/tags/machine-20211101' into staging (2021-11-02 05:53:45 -0400)

are available in the Git repository at:

https://github.com/XanClic/qemu.git tags/pull-block-2021-11-02

for you to fetch changes up to 7da9623cc078229caf07c290e16401ccdb9408d2:

block/vpc: Add a sanity check that fixed-size images have the right type (2021-11-02 12:47:51 +0100)

----------------------------------------------------------------
Emanuele Giuseppe Esposito (1):
  pylint: fix errors and warnings generated by tests/qemu-iotests/297

Eric Blake (1):
  qemu-img: Consistent docs for convert -F

Thomas Huth (1):
  block/vpc: Add a sanity check that fixed-size images have the right
    type

Thomas Weißschuh (1):
  vmdk: allow specification of tools version

-- 
2.31.1

From: Eric Blake <eblake@redhat.com>

Use consistent capitalization, and fix a missed line (we duplicate the
qemu-img synopses in too many places).

Fixes: 1899bf4737 (qemu-img: Add -F shorthand to convert)
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210921142812.2631605-1-eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
 docs/tools/qemu-img.rst | 2 +-
 qemu-img-cmds.hx        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst
index XXXXXXX..XXXXXXX 100644
--- a/docs/tools/qemu-img.rst
+++ b/docs/tools/qemu-img.rst
@@ -XXX,XX +XXX,XX @@ Command description:
   4
     Error on reading data
 
-.. option:: convert [--object OBJECTDEF] [--image-opts] [--target-image-opts] [--target-is-zero] [--bitmaps [--skip-broken-bitmaps]] [-U] [-C] [-c] [-p] [-q] [-n] [-f FMT] [-t CACHE] [-T SRC_CACHE] [-O OUTPUT_FMT] [-B BACKING_FILE [-F backing_fmt]] [-o OPTIONS] [-l SNAPSHOT_PARAM] [-S SPARSE_SIZE] [-r RATE_LIMIT] [-m NUM_COROUTINES] [-W] FILENAME [FILENAME2 [...]] OUTPUT_FILENAME
+.. option:: convert [--object OBJECTDEF] [--image-opts] [--target-image-opts] [--target-is-zero] [--bitmaps [--skip-broken-bitmaps]] [-U] [-C] [-c] [-p] [-q] [-n] [-f FMT] [-t CACHE] [-T SRC_CACHE] [-O OUTPUT_FMT] [-B BACKING_FILE [-F BACKING_FMT]] [-o OPTIONS] [-l SNAPSHOT_PARAM] [-S SPARSE_SIZE] [-r RATE_LIMIT] [-m NUM_COROUTINES] [-W] FILENAME [FILENAME2 [...]] OUTPUT_FILENAME
 
   Convert the disk image *FILENAME* or a snapshot *SNAPSHOT_PARAM*
   to disk image *OUTPUT_FILENAME* using format *OUTPUT_FMT*. It can
diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
index XXXXXXX..XXXXXXX 100644
--- a/qemu-img-cmds.hx
+++ b/qemu-img-cmds.hx
@@ -XXX,XX +XXX,XX @@ ERST
 DEF("convert", img_convert,
     "convert [--object objectdef] [--image-opts] [--target-image-opts] [--target-is-zero] [--bitmaps] [-U] [-C] [-c] [-p] [-q] [-n] [-f fmt] [-t cache] [-T src_cache] [-O output_fmt] [-B backing_file [-F backing_fmt]] [-o options] [-l snapshot_param] [-S sparse_size] [-r rate_limit] [-m num_coroutines] [-W] [--salvage] filename [filename2 [...]] output_filename")
 SRST
-.. option:: convert [--object OBJECTDEF] [--image-opts] [--target-image-opts] [--target-is-zero] [--bitmaps] [-U] [-C] [-c] [-p] [-q] [-n] [-f FMT] [-t CACHE] [-T SRC_CACHE] [-O OUTPUT_FMT] [-B BACKING_FILE] [-o OPTIONS] [-l SNAPSHOT_PARAM] [-S SPARSE_SIZE] [-r RATE_LIMIT] [-m NUM_COROUTINES] [-W] [--salvage] FILENAME [FILENAME2 [...]] OUTPUT_FILENAME
+.. option:: convert [--object OBJECTDEF] [--image-opts] [--target-image-opts] [--target-is-zero] [--bitmaps] [-U] [-C] [-c] [-p] [-q] [-n] [-f FMT] [-t CACHE] [-T SRC_CACHE] [-O OUTPUT_FMT] [-B BACKING_FILE [-F BACKING_FMT]] [-o OPTIONS] [-l SNAPSHOT_PARAM] [-S SPARSE_SIZE] [-r RATE_LIMIT] [-m NUM_COROUTINES] [-W] [--salvage] FILENAME [FILENAME2 [...]] OUTPUT_FILENAME
 ERST
 
 DEF("create", img_create,
-- 
2.31.1

From: Emanuele Giuseppe Esposito <eesposit@redhat.com>

Test 297 in tests/qemu-iotests currently fails: pylint has
learned new things to check, or we simply missed them.

All fixes in this patch are related to additional spaces used
or wrong indentation. No functional change intended.

Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Message-Id: <20211008062821.1010967-2-eesposit@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
 tests/qemu-iotests/129                  | 18 +++++++++---------
 tests/qemu-iotests/310                  | 16 ++++++++--------
 tests/qemu-iotests/check                | 11 ++++++-----
 tests/qemu-iotests/iotests.py           |  7 ++++---
 tests/qemu-iotests/tests/image-fleecing |  4 ++--
 5 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/tests/qemu-iotests/129 b/tests/qemu-iotests/129
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/129
+++ b/tests/qemu-iotests/129
@@ -XXX,XX +XXX,XX @@ class TestStopWithBlockJob(iotests.QMPTestCase):
         self.do_test_stop("drive-backup", device="drive0",
                           target=self.target_img, format=iotests.imgfmt,
                           sync="full",
-                          x_perf={ 'max-chunk': 65536,
-                                   'max-workers': 8 })
+                          x_perf={'max-chunk': 65536,
+                                  'max-workers': 8})
 
     def test_block_commit(self):
         # Add overlay above the source node so that we actually use a
@@ -XXX,XX +XXX,XX @@ class TestStopWithBlockJob(iotests.QMPTestCase):
                          '1G')
 
         result = self.vm.qmp('blockdev-add', **{
-                                 'node-name': 'overlay',
-                                 'driver': iotests.imgfmt,
-                                 'file': {
-                                     'driver': 'file',
-                                     'filename': self.overlay_img
-                                 }
-                             })
+            'node-name': 'overlay',
+            'driver': iotests.imgfmt,
+            'file': {
+                'driver': 'file',
+                'filename': self.overlay_img
+            }
+        })
         self.assert_qmp(result, 'return', {})
 
         result = self.vm.qmp('blockdev-snapshot',
diff --git a/tests/qemu-iotests/310 b/tests/qemu-iotests/310
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/310
+++ b/tests/qemu-iotests/310
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('base.img') as base_img_path, \
     assert qemu_io_silent(base_img_path, '-c', 'write -P 1 3M 1M') == 0
     assert qemu_img('create', '-f', iotests.imgfmt, '-b', base_img_path,
                     '-F', iotests.imgfmt, mid_img_path) == 0
-    assert qemu_io_silent(mid_img_path,  '-c', 'write -P 3 2M 1M') == 0
-    assert qemu_io_silent(mid_img_path,  '-c', 'write -P 3 4M 1M') == 0
+    assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 2M 1M') == 0
+    assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 4M 1M') == 0
     assert qemu_img('create', '-f', iotests.imgfmt, '-b', mid_img_path,
                     '-F', iotests.imgfmt, top_img_path) == 0
-    assert qemu_io_silent(top_img_path,  '-c', 'write -P 2 1M 1M') == 0
+    assert qemu_io_silent(top_img_path, '-c', 'write -P 2 1M 1M') == 0
 
 #      0 1 2 3 4
 # top    2
@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('base.img') as base_img_path, \
     assert qemu_img('rebase', '-u', '-b', '', '-f', iotests.imgfmt,
                     top_img_path) == 0
 
-    assert qemu_io_silent(top_img_path,  '-c', 'read -P 0 0 1M') == 0
-    assert qemu_io_silent(top_img_path,  '-c', 'read -P 2 1M 1M') == 0
-    assert qemu_io_silent(top_img_path,  '-c', 'read -P 3 2M 1M') == 0
-    assert qemu_io_silent(top_img_path,  '-c', 'read -P 0 3M 1M') == 0
-    assert qemu_io_silent(top_img_path,  '-c', 'read -P 3 4M 1M') == 0
+    assert qemu_io_silent(top_img_path, '-c', 'read -P 0 0 1M') == 0
+    assert qemu_io_silent(top_img_path, '-c', 'read -P 2 1M 1M') == 0
+    assert qemu_io_silent(top_img_path, '-c', 'read -P 3 2M 1M') == 0
+    assert qemu_io_silent(top_img_path, '-c', 'read -P 0 3M 1M') == 0
+    assert qemu_io_silent(top_img_path, '-c', 'read -P 3 4M 1M') == 0
 
     log('Done')
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -XXX,XX +XXX,XX @@ def make_argparser() -> argparse.ArgumentParser:
 
     p.add_argument('-d', dest='debug', action='store_true', help='debug')
     p.add_argument('-p', dest='print', action='store_true',
-                help='redirects qemu\'s stdout and stderr to the test output')
+                   help='redirects qemu\'s stdout and stderr to '
+                        'the test output')
     p.add_argument('-gdb', action='store_true',
-                   help="start gdbserver with $GDB_OPTIONS options \
-                        ('localhost:12345' if $GDB_OPTIONS is empty)")
+                   help="start gdbserver with $GDB_OPTIONS options "
+                        "('localhost:12345' if $GDB_OPTIONS is empty)")
     p.add_argument('-valgrind', action='store_true',
-                    help='use valgrind, sets VALGRIND_QEMU environment '
-                    'variable')
+                   help='use valgrind, sets VALGRIND_QEMU environment '
+                        'variable')
 
     p.add_argument('-misalign', action='store_true',
                    help='misalign memory allocations')
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -XXX,XX +XXX,XX @@ def _post_shutdown(self) -> None:
         super()._post_shutdown()
         if not qemu_valgrind or not self._popen:
             return
-        valgrind_filename =  f"{test_dir}/{self._popen.pid}.valgrind"
+        valgrind_filename = f"{test_dir}/{self._popen.pid}.valgrind"
         if self.exitcode() == 99:
             with open(valgrind_filename, encoding='utf-8') as f:
                 print(f.read())
@@ -XXX,XX +XXX,XX @@ def write(self, arg=None):
 
 class ReproducibleTestRunner(unittest.TextTestRunner):
     def __init__(self, stream: Optional[TextIO] = None,
-             resultclass: Type[unittest.TestResult] = ReproducibleTestResult,
-             **kwargs: Any) -> None:
+                 resultclass: Type[unittest.TestResult] =
+                 ReproducibleTestResult,
+                 **kwargs: Any) -> None:
         rstream = ReproducibleStreamWrapper(stream or sys.stdout)
         super().__init__(stream=rstream,           # type: ignore
                          descriptions=True,
diff --git a/tests/qemu-iotests/tests/image-fleecing b/tests/qemu-iotests/tests/image-fleecing
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/tests/image-fleecing
+++ b/tests/qemu-iotests/tests/image-fleecing
@@ -XXX,XX +XXX,XX @@ def do_test(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm):
 
     nbd_uri = 'nbd+unix:///%s?socket=%s' % (tmp_node, nbd_sock_path)
     log(vm.qmp('nbd-server-start',
-               {'addr': { 'type': 'unix',
-                          'data': { 'path': nbd_sock_path } } }))
+               {'addr': {'type': 'unix',
+                         'data': {'path': nbd_sock_path}}}))
 
     log(vm.qmp('nbd-server-add', device=tmp_node))
 
-- 
2.31.1

From: Thomas Weißschuh <thomas.weissschuh.ext@zeiss.com>

VMDK files support an attribute that represents the version of the guest
tools that are installed on the disk.
This attribute is used by vSphere before a machine has been started to
determine if the VM has the guest tools installed.
This is important when configuring "Operating system customizations" in
vSphere, as it checks for the presence of the guest tools before
allowing those customizations.
Thus when the VM has not yet booted normally it would be impossible to
customize it, therefore preventing a customized first-boot.

The attribute should not hurt on disks that do not have the guest tools
installed and indeed the VMware tools also unconditionally add this
attribute.
(Defaulting to the value "2147483647", as is done in this patch)

Signed-off-by: Thomas Weißschuh <thomas.weissschuh.ext@zeiss.com>
Message-Id: <20210913130419.13241-1-thomas.weissschuh.ext@zeiss.com>
[hreitz: Added missing '#' in block-core.json]
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
 qapi/block-core.json |  3 +++
 block/vmdk.c         | 24 ++++++++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
 # @adapter-type: The adapter type used to fill in the descriptor. Default: ide.
 # @hwversion: Hardware version. The meaningful options are "4" or "6".
 #             Default: "4".
+# @toolsversion: VMware guest tools version.
+#                Default: "2147483647" (Since 6.2)
 # @zeroed-grain: Whether to enable zeroed-grain feature for sparse subformats.
 #                Default: false.
 #
@@ -XXX,XX +XXX,XX @@
             '*backing-file':    'str',
             '*adapter-type':    'BlockdevVmdkAdapterType',
             '*hwversion':       'str',
+            '*toolsversion':    'str',
             '*zeroed-grain':    'bool' } }
 
 
diff --git a/block/vmdk.c b/block/vmdk.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -XXX,XX +XXX,XX @@
 #define VMDK_ZEROED  (-3)
 
 #define BLOCK_OPT_ZEROED_GRAIN "zeroed_grain"
+#define BLOCK_OPT_TOOLSVERSION "toolsversion"
 
 typedef struct {
     uint32_t version;
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_do_create(int64_t size,
                                           BlockdevVmdkAdapterType adapter_type,
                                           const char *backing_file,
                                           const char *hw_version,
+                                          const char *toolsversion,
                                           bool compat6,
                                           bool zeroed_grain,
                                           vmdk_create_extent_fn extent_fn,
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_do_create(int64_t size,
         "ddb.geometry.cylinders = \"%" PRId64 "\"\n"
         "ddb.geometry.heads = \"%" PRIu32 "\"\n"
         "ddb.geometry.sectors = \"63\"\n"
-        "ddb.adapterType = \"%s\"\n";
+        "ddb.adapterType = \"%s\"\n"
+        "ddb.toolsVersion = \"%s\"\n";
 
     ext_desc_lines = g_string_new(NULL);
 
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_do_create(int64_t size,
     if (!hw_version) {
         hw_version = "4";
     }
+    if (!toolsversion) {
+        toolsversion = "2147483647";
+    }
 
     if (adapter_type != BLOCKDEV_VMDK_ADAPTER_TYPE_IDE) {
         /* that's the number of heads with which vmware operates when
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_do_create(int64_t size,
                            size /
                                (int64_t)(63 * number_heads * BDRV_SECTOR_SIZE),
                            number_heads,
-                           BlockdevVmdkAdapterType_str(adapter_type));
+                           BlockdevVmdkAdapterType_str(adapter_type),
+                           toolsversion);
     desc_len = strlen(desc);
     /* the descriptor offset = 0x200 */
     if (!split && !flat) {
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_create_opts(BlockDriver *drv,
     BlockdevVmdkAdapterType adapter_type_enum;
     char *backing_file = NULL;
     char *hw_version = NULL;
+    char *toolsversion = NULL;
     char *fmt = NULL;
     BlockdevVmdkSubformat subformat;
     int ret = 0;
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_create_opts(BlockDriver *drv,
     adapter_type = qemu_opt_get_del(opts, BLOCK_OPT_ADAPTER_TYPE);
     backing_file = qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FILE);
     hw_version = qemu_opt_get_del(opts, BLOCK_OPT_HWVERSION);
+    toolsversion = qemu_opt_get_del(opts, BLOCK_OPT_TOOLSVERSION);
     compat6 = qemu_opt_get_bool_del(opts, BLOCK_OPT_COMPAT6, false);
     if (strcmp(hw_version, "undefined") == 0) {
         g_free(hw_version);
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_create_opts(BlockDriver *drv,
         .opts = opts,
     };
     ret = vmdk_co_do_create(total_size, subformat, adapter_type_enum,
-                            backing_file, hw_version, compat6, zeroed_grain,
-                            vmdk_co_create_opts_cb, &data, errp);
+                            backing_file, hw_version, toolsversion, compat6,
+                            zeroed_grain, vmdk_co_create_opts_cb, &data, errp);
 
 exit:
     g_free(backing_fmt);
     g_free(adapter_type);
     g_free(backing_file);
     g_free(hw_version);
+    g_free(toolsversion);
     g_free(fmt);
     g_free(desc);
     g_free(path);
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_create(BlockdevCreateOptions *create_options,
                             opts->adapter_type,
                             opts->backing_file,
                             opts->hwversion,
+                            opts->toolsversion,
                             false,
                             opts->zeroed_grain,
                             vmdk_co_create_cb,
@@ -XXX,XX +XXX,XX @@ static QemuOptsList vmdk_create_opts = {
             .help = "VMDK hardware version",
             .def_value_str = "undefined"
         },
+        {
+            .name = BLOCK_OPT_TOOLSVERSION,
+            .type = QEMU_OPT_STRING,
+            .help = "VMware guest tools version",
+        },
         {
             .name = BLOCK_OPT_SUBFMT,
             .type = QEMU_OPT_STRING,
-- 
2.31.1

From: Thomas Huth <thuth@redhat.com>

The code in vpc.c uses BDRVVPCState->footer.type in various places
to decide whether the image is a fixed-size (VHD_FIXED) or a dynamic
(VHD_DYNAMIC) image. However, we never check that this field really
contains VHD_FIXED if we detected a fixed size image in vpc_open(),
so a wrong value here could cause quite some trouble during runtime.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20211012082702.792259-1-thuth@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
 block/vpc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/block/vpc.c b/block/vpc.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -XXX,XX +XXX,XX @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags,
         if (ret < 0) {
             goto fail;
         }
-        if (strncmp(footer->creator, "conectix", 8)) {
+        if (strncmp(footer->creator, "conectix", 8) ||
+            be32_to_cpu(footer->type) != VHD_FIXED) {
             error_setg(errp, "invalid VPC image");
             ret = -EINVAL;
             goto fail;
-- 
2.31.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