Series comparison

-[Qemu-devel] [PULL 0/9] Block patches
+[PULL for-7.0 0/2] Block patches
-The following changes since commit a1cf5fac2b929ffa2abd1285401f2535ff8c6fea:
+The following changes since commit 15ef89d2a1a7b93845a6b09c2ee8e1979f6eb30b:
-  Merge remote-tracking branch 'remotes/armbru/tags/pull-block-2017-02-21' into staging (2017-02-21 13:58:50 +0000)
+  Update version for v7.0.0-rc1 release (2022-03-22 22:58:44 +0000)
-are available in the git repository at:
+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 6135c5e12606b8413708384e3e7d43f6010c5941:
+for you to fetch changes up to 2539eade4f689eda7e9fe45486f18334bfbafaf0:
-  qemu-options: Fix broken sheepdog URL (2017-02-21 10:38:09 -0500)
+  hw: Fix misleading hexadecimal format (2022-03-24 10:38:42 +0000)
 ----------------------------------------------------------------
-Block patches
+Pull request
 Philippe found cases where the 0x%d format string was used, leading to
 misleading output. The patches look harmless and could save people time, so I
 think it's worth including them in 7.0.
 ----------------------------------------------------------------
-Anton Nefedov (1):
+Philippe Mathieu-Daudé (2):
-  mirror: do not increase offset during initial zero_or_discard phase
+  block: Fix misleading hexadecimal format
   hw: Fix misleading hexadecimal format
-Jeff Cody (1):
+ block/parallels-ext.c | 2 +-
-  QAPI: Fix blockdev-add example documentation
+ hw/i386/sgx.c         | 2 +-
+ hw/i386/trace-events  | 6 +++---
-Kevin Wolf (6):
+ hw/misc/trace-events  | 4 ++--
-  iscsi: Split URL into individual options
+ hw/scsi/trace-events  | 4 ++--
-  iscsi: Handle -iscsi user/password in bdrv_parse_filename()
+files changed, 9 insertions(+), 9 deletions(-)
   iscsi: Add initiator-name option
   iscsi: Add header-digest option
   iscsi: Add timeout option
   iscsi: Add blockdev-add support
 Thomas Huth (1):
   qemu-options: Fix broken sheepdog URL
  block/iscsi.c        | 353 +++++++++++++++++++++++++++++++--------------------
  block/mirror.c       |   9 +-
  qapi/block-core.json | 125 +++++++++++++-----
  qemu-options.hx      |   2 +-
 files changed, 317 insertions(+), 172 deletions(-)
 --
-.9.3
+.35.1

-[Qemu-devel] [PULL 1/9] iscsi: Split URL into individual options
+Deleted patch
-From: Kevin Wolf <kwolf@redhat.com>
-This introduces a .bdrv_parse_filename handler for iscsi which parses an
-URL if given and translates it to individual options.
-Reviewed-by: Fam Zheng <famz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Jeff Cody <jcody@redhat.com>
----
- block/iscsi.c | 193 ++++++++++++++++++++++++++++++++++++++++++----------------
-file changed, 140 insertions(+), 53 deletions(-)
-diff --git a/block/iscsi.c b/block/iscsi.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/iscsi.c
-+++ b/block/iscsi.c
-@@ -XXX,XX +XXX,XX @@ static void iscsi_readcapacity_sync(IscsiLun *iscsilun, Error **errp)
-     }
- }
--/* TODO Convert to fine grained options */
--static QemuOptsList runtime_opts = {
--    .name = "iscsi",
--    .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
--    .desc = {
--        {
--            .name = "filename",
--            .type = QEMU_OPT_STRING,
--            .help = "URL to the iscsi image",
--        },
--        { /* end of list */ }
--    },
--};
--
- static struct scsi_task *iscsi_do_inquiry(struct iscsi_context *iscsi, int lun,
-                                           int evpd, int pc, void **inq, Error **errp)
- {
-@@ -XXX,XX +XXX,XX @@ out:
-  * We support iscsi url's on the form
-  * iscsi://[<username>%<password>@]<host>[:<port>]/<targetname>/<lun>
-  */
-+static void iscsi_parse_filename(const char *filename, QDict *options,
-+                                 Error **errp)
-+{
-+    struct iscsi_url *iscsi_url;
-+    const char *transport_name;
-+    char *lun_str;
-+
-+    iscsi_url = iscsi_parse_full_url(NULL, filename);
-+    if (iscsi_url == NULL) {
-+        error_setg(errp, "Failed to parse URL : %s", filename);
-+        return;
-+    }
-+
-+#if LIBISCSI_API_VERSION >= (20160603)
-+    switch (iscsi_url->transport) {
-+    case TCP_TRANSPORT:
-+        transport_name = "tcp";
-+        break;
-+    case ISER_TRANSPORT:
-+        transport_name = "iser";
-+        break;
-+    default:
-+        error_setg(errp, "Unknown transport type (%d)",
-+                   iscsi_url->transport);
-+        return;
-+    }
-+#else
-+    transport_name = "tcp";
-+#endif
-+
-+    qdict_set_default_str(options, "transport", transport_name);
-+    qdict_set_default_str(options, "portal", iscsi_url->portal);
-+    qdict_set_default_str(options, "target", iscsi_url->target);
-+
-+    lun_str = g_strdup_printf("%d", iscsi_url->lun);
-+    qdict_set_default_str(options, "lun", lun_str);
-+    g_free(lun_str);
-+
-+    if (iscsi_url->user[0] != '\0') {
-+        qdict_set_default_str(options, "user", iscsi_url->user);
-+        qdict_set_default_str(options, "password", iscsi_url->passwd);
-+    }
-+
-+    iscsi_destroy_url(iscsi_url);
-+}
-+
-+/* TODO Add -iscsi options */
-+static QemuOptsList runtime_opts = {
-+    .name = "iscsi",
-+    .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
-+    .desc = {
-+        {
-+            .name = "transport",
-+            .type = QEMU_OPT_STRING,
-+        },
-+        {
-+            .name = "portal",
-+            .type = QEMU_OPT_STRING,
-+        },
-+        {
-+            .name = "target",
-+            .type = QEMU_OPT_STRING,
-+        },
-+        {
-+            .name = "user",
-+            .type = QEMU_OPT_STRING,
-+        },
-+        {
-+            .name = "password",
-+            .type = QEMU_OPT_STRING,
-+        },
-+        {
-+            .name = "lun",
-+            .type = QEMU_OPT_NUMBER,
-+        },
-+        { /* end of list */ }
-+    },
-+};
-+
- static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
-                       Error **errp)
- {
-     IscsiLun *iscsilun = bs->opaque;
-     struct iscsi_context *iscsi = NULL;
--    struct iscsi_url *iscsi_url = NULL;
-     struct scsi_task *task = NULL;
-     struct scsi_inquiry_standard *inq = NULL;
-     struct scsi_inquiry_supported_pages *inq_vpd;
-     char *initiator_name = NULL;
-     QemuOpts *opts;
-     Error *local_err = NULL;
--    const char *filename;
--    int i, ret = 0, timeout = 0;
-+    const char *transport_name, *portal, *target;
-+    const char *user, *password;
-+#if LIBISCSI_API_VERSION >= (20160603)
-+    enum iscsi_transport_type transport;
-+#endif
-+    int i, ret = 0, timeout = 0, lun;
-     opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
-     qemu_opts_absorb_qdict(opts, options, &local_err);
-@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
-         goto out;
-     }
--    filename = qemu_opt_get(opts, "filename");
-+    transport_name = qemu_opt_get(opts, "transport");
-+    portal = qemu_opt_get(opts, "portal");
-+    target = qemu_opt_get(opts, "target");
-+    user = qemu_opt_get(opts, "user");
-+    password = qemu_opt_get(opts, "password");
-+    lun = qemu_opt_get_number(opts, "lun", 0);
--    iscsi_url = iscsi_parse_full_url(iscsi, filename);
--    if (iscsi_url == NULL) {
--        error_setg(errp, "Failed to parse URL : %s", filename);
-+    if (!transport_name || !portal || !target) {
-+        error_setg(errp, "Need all of transport, portal and target options");
-+        ret = -EINVAL;
-+        goto out;
-+    }
-+    if (user && !password) {
-+        error_setg(errp, "If a user name is given, a password is required");
-+        ret = -EINVAL;
-+        goto out;
-+    }
-+
-+    if (!strcmp(transport_name, "tcp")) {
-+#if LIBISCSI_API_VERSION >= (20160603)
-+        transport = TCP_TRANSPORT;
-+    } else if (!strcmp(transport_name, "iser")) {
-+        transport = ISER_TRANSPORT;
-+#else
-+        /* TCP is what older libiscsi versions always use */
-+#endif
-+    } else {
-+        error_setg(errp, "Unknown transport: %s", transport_name);
-         ret = -EINVAL;
-         goto out;
-     }
-     memset(iscsilun, 0, sizeof(IscsiLun));
--    initiator_name = parse_initiator_name(iscsi_url->target);
-+    initiator_name = parse_initiator_name(target);
-     iscsi = iscsi_create_context(initiator_name);
-     if (iscsi == NULL) {
-@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
-         goto out;
-     }
- #if LIBISCSI_API_VERSION >= (20160603)
--    if (iscsi_init_transport(iscsi, iscsi_url->transport)) {
-+    if (iscsi_init_transport(iscsi, transport)) {
-         error_setg(errp, ("Error initializing transport."));
-         ret = -EINVAL;
-         goto out;
-     }
- #endif
--    if (iscsi_set_targetname(iscsi, iscsi_url->target)) {
-+    if (iscsi_set_targetname(iscsi, target)) {
-         error_setg(errp, "iSCSI: Failed to set target name.");
-         ret = -EINVAL;
-         goto out;
-     }
--    if (iscsi_url->user[0] != '\0') {
--        ret = iscsi_set_initiator_username_pwd(iscsi, iscsi_url->user,
--                                              iscsi_url->passwd);
-+    if (user) {
-+        ret = iscsi_set_initiator_username_pwd(iscsi, user, password);
-         if (ret != 0) {
-             error_setg(errp, "Failed to set initiator username and password");
-             ret = -EINVAL;
-@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
-     }
-     /* check if we got CHAP username/password via the options */
--    parse_chap(iscsi, iscsi_url->target, &local_err);
-+    parse_chap(iscsi, target, &local_err);
-     if (local_err != NULL) {
-         error_propagate(errp, local_err);
-         ret = -EINVAL;
-@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
-     iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
-     /* check if we got HEADER_DIGEST via the options */
--    parse_header_digest(iscsi, iscsi_url->target, &local_err);
-+    parse_header_digest(iscsi, target, &local_err);
-     if (local_err != NULL) {
-         error_propagate(errp, local_err);
-         ret = -EINVAL;
-@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
-     }
-     /* timeout handling is broken in libiscsi before 1.15.0 */
--    timeout = parse_timeout(iscsi_url->target);
-+    timeout = parse_timeout(target);
- #if LIBISCSI_API_VERSION >= 20150621
-     iscsi_set_timeout(iscsi, timeout);
- #else
-@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
-     }
- #endif
--    if (iscsi_full_connect_sync(iscsi, iscsi_url->portal, iscsi_url->lun) != 0) {
-+    if (iscsi_full_connect_sync(iscsi, portal, lun) != 0) {
-         error_setg(errp, "iSCSI: Failed to connect to LUN : %s",
-             iscsi_get_error(iscsi));
-         ret = -EINVAL;
-@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
-     iscsilun->iscsi = iscsi;
-     iscsilun->aio_context = bdrv_get_aio_context(bs);
--    iscsilun->lun   = iscsi_url->lun;
-+    iscsilun->lun = lun;
-     iscsilun->has_write_same = true;
-     task = iscsi_do_inquiry(iscsilun->iscsi, iscsilun->lun, 0, 0,
-@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
- out:
-     qemu_opts_del(opts);
-     g_free(initiator_name);
--    if (iscsi_url != NULL) {
--        iscsi_destroy_url(iscsi_url);
--    }
-     if (task != NULL) {
-         scsi_free_scsi_task(task);
-     }
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_iscsi = {
-     .format_name     = "iscsi",
-     .protocol_name   = "iscsi",
--    .instance_size   = sizeof(IscsiLun),
--    .bdrv_needs_filename = true,
--    .bdrv_file_open  = iscsi_open,
--    .bdrv_close      = iscsi_close,
--    .bdrv_create     = iscsi_create,
--    .create_opts     = &iscsi_create_opts,
--    .bdrv_reopen_prepare   = iscsi_reopen_prepare,
--    .bdrv_reopen_commit    = iscsi_reopen_commit,
--    .bdrv_invalidate_cache = iscsi_invalidate_cache,
-+    .instance_size          = sizeof(IscsiLun),
-+    .bdrv_parse_filename    = iscsi_parse_filename,
-+    .bdrv_file_open         = iscsi_open,
-+    .bdrv_close             = iscsi_close,
-+    .bdrv_create            = iscsi_create,
-+    .create_opts            = &iscsi_create_opts,
-+    .bdrv_reopen_prepare    = iscsi_reopen_prepare,
-+    .bdrv_reopen_commit     = iscsi_reopen_commit,
-+    .bdrv_invalidate_cache  = iscsi_invalidate_cache,
-     .bdrv_getlength  = iscsi_getlength,
-     .bdrv_get_info   = iscsi_get_info,
-@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_iser = {
-     .format_name     = "iser",
-     .protocol_name   = "iser",
--    .instance_size   = sizeof(IscsiLun),
--    .bdrv_needs_filename = true,
--    .bdrv_file_open  = iscsi_open,
--    .bdrv_close      = iscsi_close,
--    .bdrv_create     = iscsi_create,
--    .create_opts     = &iscsi_create_opts,
--    .bdrv_reopen_prepare   = iscsi_reopen_prepare,
--    .bdrv_reopen_commit    = iscsi_reopen_commit,
--    .bdrv_invalidate_cache = iscsi_invalidate_cache,
-+    .instance_size          = sizeof(IscsiLun),
-+    .bdrv_parse_filename    = iscsi_parse_filename,
-+    .bdrv_file_open         = iscsi_open,
-+    .bdrv_close             = iscsi_close,
-+    .bdrv_create            = iscsi_create,
-+    .create_opts            = &iscsi_create_opts,
-+    .bdrv_reopen_prepare    = iscsi_reopen_prepare,
-+    .bdrv_reopen_commit     = iscsi_reopen_commit,
-+    .bdrv_invalidate_cache  = iscsi_invalidate_cache,
-     .bdrv_getlength  = iscsi_getlength,
-     .bdrv_get_info   = iscsi_get_info,
---
-.9.3

-[Qemu-devel] [PULL 2/9] iscsi: Handle -iscsi user/password in bdrv_parse_filename()
+Deleted patch
-From: Kevin Wolf <kwolf@redhat.com>
-This splits the logic in the old parse_chap() function into a part that
-parses the -iscsi options into the new driver-specific options, and
-another part that actually applies those options (called apply_chap()
-now).
-Note that this means that username and password specified with -iscsi
-only take effect when a URL is provided. This is intentional, -iscsi is
-a legacy interface only supported for compatibility, new users should
-use the proper driver-specific options.
-Reviewed-by: Fam Zheng <famz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Jeff Cody <jcody@redhat.com>
----
- block/iscsi.c | 78 +++++++++++++++++++++++++++++++++--------------------------
-file changed, 44 insertions(+), 34 deletions(-)
-diff --git a/block/iscsi.c b/block/iscsi.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/iscsi.c
-+++ b/block/iscsi.c
-@@ -XXX,XX +XXX,XX @@ retry:
-     return 0;
- }
--static void parse_chap(struct iscsi_context *iscsi, const char *target,
-+static void apply_chap(struct iscsi_context *iscsi, QemuOpts *opts,
-                        Error **errp)
- {
--    QemuOptsList *list;
--    QemuOpts *opts;
-     const char *user = NULL;
-     const char *password = NULL;
-     const char *secretid;
-     char *secret = NULL;
--    list = qemu_find_opts("iscsi");
--    if (!list) {
--        return;
--    }
--
--    opts = qemu_opts_find(list, target);
--    if (opts == NULL) {
--        opts = QTAILQ_FIRST(&list->head);
--        if (!opts) {
--            return;
--        }
--    }
--
-     user = qemu_opt_get(opts, "user");
-     if (!user) {
-         return;
-@@ -XXX,XX +XXX,XX @@ out:
-     }
- }
-+static void iscsi_parse_iscsi_option(const char *target, QDict *options)
-+{
-+    QemuOptsList *list;
-+    QemuOpts *opts;
-+    const char *user, *password, *password_secret;
-+
-+    list = qemu_find_opts("iscsi");
-+    if (!list) {
-+        return;
-+    }
-+
-+    opts = qemu_opts_find(list, target);
-+    if (opts == NULL) {
-+        opts = QTAILQ_FIRST(&list->head);
-+        if (!opts) {
-+            return;
-+        }
-+    }
-+
-+    user = qemu_opt_get(opts, "user");
-+    if (user) {
-+        qdict_set_default_str(options, "user", user);
-+    }
-+
-+    password = qemu_opt_get(opts, "password");
-+    if (password) {
-+        qdict_set_default_str(options, "password", password);
-+    }
-+
-+    password_secret = qemu_opt_get(opts, "password-secret");
-+    if (password_secret) {
-+        qdict_set_default_str(options, "password-secret", password_secret);
-+    }
-+}
-+
- /*
-  * We support iscsi url's on the form
-  * iscsi://[<username>%<password>@]<host>[:<port>]/<targetname>/<lun>
-@@ -XXX,XX +XXX,XX @@ static void iscsi_parse_filename(const char *filename, QDict *options,
-     qdict_set_default_str(options, "lun", lun_str);
-     g_free(lun_str);
-+    /* User/password from -iscsi take precedence over those from the URL */
-+    iscsi_parse_iscsi_option(iscsi_url->target, options);
-+
-     if (iscsi_url->user[0] != '\0') {
-         qdict_set_default_str(options, "user", iscsi_url->user);
-         qdict_set_default_str(options, "password", iscsi_url->passwd);
-@@ -XXX,XX +XXX,XX @@ static QemuOptsList runtime_opts = {
-             .type = QEMU_OPT_STRING,
-         },
-         {
-+            .name = "password-secret",
-+            .type = QEMU_OPT_STRING,
-+        },
-+        {
-             .name = "lun",
-             .type = QEMU_OPT_NUMBER,
-         },
-@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
-     QemuOpts *opts;
-     Error *local_err = NULL;
-     const char *transport_name, *portal, *target;
--    const char *user, *password;
- #if LIBISCSI_API_VERSION >= (20160603)
-     enum iscsi_transport_type transport;
- #endif
-@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
-     transport_name = qemu_opt_get(opts, "transport");
-     portal = qemu_opt_get(opts, "portal");
-     target = qemu_opt_get(opts, "target");
--    user = qemu_opt_get(opts, "user");
--    password = qemu_opt_get(opts, "password");
-     lun = qemu_opt_get_number(opts, "lun", 0);
-     if (!transport_name || !portal || !target) {
-@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
-         ret = -EINVAL;
-         goto out;
-     }
--    if (user && !password) {
--        error_setg(errp, "If a user name is given, a password is required");
--        ret = -EINVAL;
--        goto out;
--    }
-     if (!strcmp(transport_name, "tcp")) {
- #if LIBISCSI_API_VERSION >= (20160603)
-@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
-         goto out;
-     }
--    if (user) {
--        ret = iscsi_set_initiator_username_pwd(iscsi, user, password);
--        if (ret != 0) {
--            error_setg(errp, "Failed to set initiator username and password");
--            ret = -EINVAL;
--            goto out;
--        }
--    }
--
-     /* check if we got CHAP username/password via the options */
--    parse_chap(iscsi, target, &local_err);
-+    apply_chap(iscsi, opts, &local_err);
-     if (local_err != NULL) {
-         error_propagate(errp, local_err);
-         ret = -EINVAL;
---
-.9.3

-[Qemu-devel] [PULL 3/9] iscsi: Add initiator-name option
+Deleted patch
-From: Kevin Wolf <kwolf@redhat.com>
-This was previously only available with -iscsi. Again, after this patch,
-the -iscsi option only takes effect if an URL is given. New users are
-supposed to use the new driver-specific option.
-Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
-Reviewed-by: Fam Zheng <famz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Jeff Cody <jcody@redhat.com>
----
- block/iscsi.c | 32 +++++++++++++++-----------------
-file changed, 15 insertions(+), 17 deletions(-)
-diff --git a/block/iscsi.c b/block/iscsi.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/iscsi.c
-+++ b/block/iscsi.c
-@@ -XXX,XX +XXX,XX @@ static void parse_header_digest(struct iscsi_context *iscsi, const char *target,
-     }
- }
--static char *parse_initiator_name(const char *target)
-+static char *get_initiator_name(QemuOpts *opts)
- {
--    QemuOptsList *list;
--    QemuOpts *opts;
-     const char *name;
-     char *iscsi_name;
-     UuidInfo *uuid_info;
--    list = qemu_find_opts("iscsi");
--    if (list) {
--        opts = qemu_opts_find(list, target);
--        if (!opts) {
--            opts = QTAILQ_FIRST(&list->head);
--        }
--        if (opts) {
--            name = qemu_opt_get(opts, "initiator-name");
--            if (name) {
--                return g_strdup(name);
--            }
--        }
-+    name = qemu_opt_get(opts, "initiator-name");
-+    if (name) {
-+        return g_strdup(name);
-     }
-     uuid_info = qmp_query_uuid(NULL);
-@@ -XXX,XX +XXX,XX @@ static void iscsi_parse_iscsi_option(const char *target, QDict *options)
- {
-     QemuOptsList *list;
-     QemuOpts *opts;
--    const char *user, *password, *password_secret;
-+    const char *user, *password, *password_secret, *initiator_name;
-     list = qemu_find_opts("iscsi");
-     if (!list) {
-@@ -XXX,XX +XXX,XX @@ static void iscsi_parse_iscsi_option(const char *target, QDict *options)
-     if (password_secret) {
-         qdict_set_default_str(options, "password-secret", password_secret);
-     }
-+
-+    initiator_name = qemu_opt_get(opts, "initiator-name");
-+    if (initiator_name) {
-+        qdict_set_default_str(options, "initiator-name", initiator_name);
-+    }
- }
- /*
-@@ -XXX,XX +XXX,XX @@ static QemuOptsList runtime_opts = {
-             .name = "lun",
-             .type = QEMU_OPT_NUMBER,
-         },
-+        {
-+            .name = "initiator-name",
-+            .type = QEMU_OPT_STRING,
-+        },
-         { /* end of list */ }
-     },
- };
-@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
-     memset(iscsilun, 0, sizeof(IscsiLun));
--    initiator_name = parse_initiator_name(target);
-+    initiator_name = get_initiator_name(opts);
-     iscsi = iscsi_create_context(initiator_name);
-     if (iscsi == NULL) {
---
-.9.3

-[Qemu-devel] [PULL 4/9] iscsi: Add header-digest option
+Deleted patch
-From: Kevin Wolf <kwolf@redhat.com>
-This was previously only available with -iscsi. Again, after this patch,
-the -iscsi option only takes effect if an URL is given. New users are
-supposed to use the new driver-specific option.
-Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
-Reviewed-by: Fam Zheng <famz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Jeff Cody <jcody@redhat.com>
----
- block/iscsi.c | 39 +++++++++++++++------------------------
-file changed, 15 insertions(+), 24 deletions(-)
-diff --git a/block/iscsi.c b/block/iscsi.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/iscsi.c
-+++ b/block/iscsi.c
-@@ -XXX,XX +XXX,XX @@ static void apply_chap(struct iscsi_context *iscsi, QemuOpts *opts,
-     g_free(secret);
- }
--static void parse_header_digest(struct iscsi_context *iscsi, const char *target,
-+static void apply_header_digest(struct iscsi_context *iscsi, QemuOpts *opts,
-                                 Error **errp)
- {
--    QemuOptsList *list;
--    QemuOpts *opts;
-     const char *digest = NULL;
--    list = qemu_find_opts("iscsi");
--    if (!list) {
--        return;
--    }
--
--    opts = qemu_opts_find(list, target);
--    if (opts == NULL) {
--        opts = QTAILQ_FIRST(&list->head);
--        if (!opts) {
--            return;
--        }
--    }
--
-     digest = qemu_opt_get(opts, "header-digest");
-     if (!digest) {
--        return;
--    }
--
--    if (!strcmp(digest, "CRC32C")) {
-+        iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
-+    } else if (!strcmp(digest, "CRC32C")) {
-         iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_CRC32C);
-     } else if (!strcmp(digest, "NONE")) {
-         iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE);
-@@ -XXX,XX +XXX,XX @@ static void iscsi_parse_iscsi_option(const char *target, QDict *options)
- {
-     QemuOptsList *list;
-     QemuOpts *opts;
--    const char *user, *password, *password_secret, *initiator_name;
-+    const char *user, *password, *password_secret, *initiator_name,
-+               *header_digest;
-     list = qemu_find_opts("iscsi");
-     if (!list) {
-@@ -XXX,XX +XXX,XX @@ static void iscsi_parse_iscsi_option(const char *target, QDict *options)
-     if (initiator_name) {
-         qdict_set_default_str(options, "initiator-name", initiator_name);
-     }
-+
-+    header_digest = qemu_opt_get(opts, "header-digest");
-+    if (header_digest) {
-+        qdict_set_default_str(options, "header-digest", header_digest);
-+    }
- }
- /*
-@@ -XXX,XX +XXX,XX @@ static QemuOptsList runtime_opts = {
-             .name = "initiator-name",
-             .type = QEMU_OPT_STRING,
-         },
-+        {
-+            .name = "header-digest",
-+            .type = QEMU_OPT_STRING,
-+        },
-         { /* end of list */ }
-     },
- };
-@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
-         goto out;
-     }
--    iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
--
-     /* check if we got HEADER_DIGEST via the options */
--    parse_header_digest(iscsi, target, &local_err);
-+    apply_header_digest(iscsi, opts, &local_err);
-     if (local_err != NULL) {
-         error_propagate(errp, local_err);
-         ret = -EINVAL;
---
-.9.3

-[Qemu-devel] [PULL 5/9] iscsi: Add timeout option
+Deleted patch
-From: Kevin Wolf <kwolf@redhat.com>
-This was previously only available with -iscsi. Again, after this patch,
-the -iscsi option only takes effect if an URL is given. New users are
-supposed to use the new driver-specific option.
-All -iscsi options have a corresponding driver-specific option for the
-iscsi block driver now.
-Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
-Reviewed-by: Fam Zheng <famz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Jeff Cody <jcody@redhat.com>
----
- block/iscsi.c | 37 +++++++++++--------------------------
-file changed, 11 insertions(+), 26 deletions(-)
-diff --git a/block/iscsi.c b/block/iscsi.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/iscsi.c
-+++ b/block/iscsi.c
-@@ -XXX,XX +XXX,XX @@ static char *get_initiator_name(QemuOpts *opts)
-     return iscsi_name;
- }
--static int parse_timeout(const char *target)
--{
--    QemuOptsList *list;
--    QemuOpts *opts;
--    const char *timeout;
--
--    list = qemu_find_opts("iscsi");
--    if (list) {
--        opts = qemu_opts_find(list, target);
--        if (!opts) {
--            opts = QTAILQ_FIRST(&list->head);
--        }
--        if (opts) {
--            timeout = qemu_opt_get(opts, "timeout");
--            if (timeout) {
--                return atoi(timeout);
--            }
--        }
--    }
--
--    return 0;
--}
--
- static void iscsi_nop_timed_event(void *opaque)
- {
-     IscsiLun *iscsilun = opaque;
-@@ -XXX,XX +XXX,XX @@ static void iscsi_parse_iscsi_option(const char *target, QDict *options)
-     QemuOptsList *list;
-     QemuOpts *opts;
-     const char *user, *password, *password_secret, *initiator_name,
--               *header_digest;
-+               *header_digest, *timeout;
-     list = qemu_find_opts("iscsi");
-     if (!list) {
-@@ -XXX,XX +XXX,XX @@ static void iscsi_parse_iscsi_option(const char *target, QDict *options)
-     if (header_digest) {
-         qdict_set_default_str(options, "header-digest", header_digest);
-     }
-+
-+    timeout = qemu_opt_get(opts, "timeout");
-+    if (timeout) {
-+        qdict_set_default_str(options, "timeout", timeout);
-+    }
- }
- /*
-@@ -XXX,XX +XXX,XX @@ static void iscsi_parse_filename(const char *filename, QDict *options,
-     iscsi_destroy_url(iscsi_url);
- }
--/* TODO Add -iscsi options */
- static QemuOptsList runtime_opts = {
-     .name = "iscsi",
-     .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
-@@ -XXX,XX +XXX,XX @@ static QemuOptsList runtime_opts = {
-             .name = "header-digest",
-             .type = QEMU_OPT_STRING,
-         },
-+        {
-+            .name = "timeout",
-+            .type = QEMU_OPT_NUMBER,
-+        },
-         { /* end of list */ }
-     },
- };
-@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
-     }
-     /* timeout handling is broken in libiscsi before 1.15.0 */
--    timeout = parse_timeout(target);
-+    timeout = qemu_opt_get_number(opts, "timeout", 0);
- #if LIBISCSI_API_VERSION >= 20150621
-     iscsi_set_timeout(iscsi, timeout);
- #else
---
-.9.3

-[Qemu-devel] [PULL 9/9] qemu-options: Fix broken sheepdog URL
+[PULL for-7.0 1/2] block: Fix misleading hexadecimal format
-From: Thomas Huth <thuth@redhat.com>
+From: Philippe Mathieu-Daudé <f4bug@amsat.org>
-The sheepdog URL is broken twice: First it uses a duplicated
+"0x%u" format is very misleading, replace by "0x%x".
 http:// prefix, second the website seems to have moved to
 https://sheepdog.github.io/sheepdog/ instead.
-Signed-off-by: Thomas Huth <thuth@redhat.com>
+Found running:
-Signed-off-by: Jeff Cody <jcody@redhat.com>
   $ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' block/
 Inspired-by: Richard Henderson <richard.henderson@linaro.org>
 Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
 Reviewed-by: Hanna Reitz <hreitz@redhat.com>
 Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
 Reviewed-by: Denis V. Lunev <den@openvz.org>
 Message-id: 20220323114718.58714-2-philippe.mathieu.daude@gmail.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- qemu-options.hx | 2 +-
+ block/parallels-ext.c | 2 +-
 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/qemu-options.hx b/qemu-options.hx
+diff --git a/block/parallels-ext.c b/block/parallels-ext.c
 index XXXXXXX..XXXXXXX 100644
---- a/qemu-options.hx
+--- a/block/parallels-ext.c
-+++ b/qemu-options.hx
++++ b/block/parallels-ext.c
-@@ -XXX,XX +XXX,XX @@ Example
+@@ -XXX,XX +XXX,XX @@ static int parallels_parse_format_extension(BlockDriverState *bs,
- qemu-system-i386 --drive file=sheepdog://192.0.2.1:30000/MyVirtualMachine
+             break;
- @end example
+         default:
--See also @url{http://http://www.osrg.net/sheepdog/}.
+-            error_setg(errp, "Unknown feature: 0x%" PRIu64, fh.magic);
-+See also @url{https://sheepdog.github.io/sheepdog/}.
++            error_setg(errp, "Unknown feature: 0x%" PRIx64, fh.magic);
+             goto fail;
- @item GlusterFS
+         }
- GlusterFS is a user space distributed file system.
 --
-.9.3
+.35.1

-[Qemu-devel] [PULL 6/9] iscsi: Add blockdev-add support
+[PULL for-7.0 2/2] hw: Fix misleading hexadecimal format
-From: Kevin Wolf <kwolf@redhat.com>
+From: Philippe Mathieu-Daudé <f4bug@amsat.org>
-This adds blockdev-add support for iscsi devices.
+"0x%u" format is very misleading, replace by "0x%x".
-Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
+Found running:
-Reviewed-by: Fam Zheng <famz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+  $ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' hw/
-Signed-off-by: Jeff Cody <jcody@redhat.com>
 Inspired-by: Richard Henderson <richard.henderson@linaro.org>
 Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
 Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
 Message-id: 20220323114718.58714-3-philippe.mathieu.daude@gmail.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block/iscsi.c        | 14 ++++++----
+ hw/i386/sgx.c        | 2 +-
- qapi/block-core.json | 75 ++++++++++++++++++++++++++++++++++++++++++++++++----
+ hw/i386/trace-events | 6 +++---
-files changed, 79 insertions(+), 10 deletions(-)
+ hw/misc/trace-events | 4 ++--
  hw/scsi/trace-events | 4 ++--
 files changed, 8 insertions(+), 8 deletions(-)
-diff --git a/block/iscsi.c b/block/iscsi.c
+diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/iscsi.c
+--- a/hw/i386/sgx.c
-+++ b/block/iscsi.c
++++ b/hw/i386/sgx.c
-@@ -XXX,XX +XXX,XX @@ static void apply_header_digest(struct iscsi_context *iscsi, QemuOpts *opts,
+@@ -XXX,XX +XXX,XX @@ void pc_machine_init_sgx_epc(PCMachineState *pcms)
      digest = qemu_opt_get(opts, "header-digest");
      if (!digest) {
          iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
 -    } else if (!strcmp(digest, "CRC32C")) {
 +    } else if (!strcmp(digest, "crc32c")) {
          iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_CRC32C);
 -    } else if (!strcmp(digest, "NONE")) {
 +    } else if (!strcmp(digest, "none")) {
          iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE);
 -    } else if (!strcmp(digest, "CRC32C-NONE")) {
 +    } else if (!strcmp(digest, "crc32c-none")) {
          iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_CRC32C_NONE);
 -    } else if (!strcmp(digest, "NONE-CRC32C")) {
 +    } else if (!strcmp(digest, "none-crc32c")) {
          iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
      } else {
          error_setg(errp, "Invalid header-digest setting : %s", digest);
@@ -XXX,XX +XXX,XX @@ static void iscsi_parse_iscsi_option(const char *target, QDict *options)
      header_digest = qemu_opt_get(opts, "header-digest");
      if (header_digest) {
 -        qdict_set_default_str(options, "header-digest", header_digest);
 +        /* -iscsi takes upper case values, but QAPI only supports lower case
 +         * enum constant names, so we have to convert here. */
 +        char *qapi_value = g_ascii_strdown(header_digest, -1);
 +        qdict_set_default_str(options, "header-digest", qapi_value);
 +        g_free(qapi_value);
      }
-     timeout = qemu_opt_get(opts, "timeout");
+     if ((sgx_epc->base + sgx_epc->size) < sgx_epc->base) {
-diff --git a/qapi/block-core.json b/qapi/block-core.json
+-        error_report("Size of all 'sgx-epc' =0x%"PRIu64" causes EPC to wrap",
 +        error_report("Size of all 'sgx-epc' =0x%"PRIx64" causes EPC to wrap",
                       sgx_epc->size);
          exit(EXIT_FAILURE);
      }
 diff --git a/hw/i386/trace-events b/hw/i386/trace-events
 index XXXXXXX..XXXXXXX 100644
---- a/qapi/block-core.json
+--- a/hw/i386/trace-events
-+++ b/qapi/block-core.json
++++ b/hw/i386/trace-events
@@ -XXX,XX +XXX,XX @@ vtd_fault_disabled(void) "Fault processing disabled for context entry"
  vtd_replay_ce_valid(const char *mode, uint8_t bus, uint8_t dev, uint8_t fn, uint16_t domain, uint64_t hi, uint64_t lo) "%s: replay valid context device %02"PRIx8":%02"PRIx8".%02"PRIx8" domain 0x%"PRIx16" hi 0x%"PRIx64" lo 0x%"PRIx64
  vtd_replay_ce_invalid(uint8_t bus, uint8_t dev, uint8_t fn) "replay invalid context device %02"PRIx8":%02"PRIx8".%02"PRIx8
  vtd_page_walk_level(uint64_t addr, uint32_t level, uint64_t start, uint64_t end) "walk (base=0x%"PRIx64", level=%"PRIu32") iova range 0x%"PRIx64" - 0x%"PRIx64
 -vtd_page_walk_one(uint16_t domain, uint64_t iova, uint64_t gpa, uint64_t mask, int perm) "domain 0x%"PRIu16" iova 0x%"PRIx64" -> gpa 0x%"PRIx64" mask 0x%"PRIx64" perm %d"
 +vtd_page_walk_one(uint16_t domain, uint64_t iova, uint64_t gpa, uint64_t mask, int perm) "domain 0x%"PRIx16" iova 0x%"PRIx64" -> gpa 0x%"PRIx64" mask 0x%"PRIx64" perm %d"
  vtd_page_walk_one_skip_map(uint64_t iova, uint64_t mask, uint64_t translated) "iova 0x%"PRIx64" mask 0x%"PRIx64" translated 0x%"PRIx64
  vtd_page_walk_one_skip_unmap(uint64_t iova, uint64_t mask) "iova 0x%"PRIx64" mask 0x%"PRIx64
  vtd_page_walk_skip_read(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to unable to read"
  vtd_page_walk_skip_reserve(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to rsrv set"
  vtd_switch_address_space(uint8_t bus, uint8_t slot, uint8_t fn, bool on) "Device %02x:%02x.%x switching address space (iommu enabled=%d)"
  vtd_as_unmap_whole(uint8_t bus, uint8_t slot, uint8_t fn, uint64_t iova, uint64_t size) "Device %02x:%02x.%x start 0x%"PRIx64" size 0x%"PRIx64
 -vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIu16", iova 0x%"PRIx64
 -vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIu16" %d"
 +vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIx16", iova 0x%"PRIx64
 +vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIx16" %d"
  vtd_irq_generate(uint64_t addr, uint64_t data) "addr 0x%"PRIx64" data 0x%"PRIx64
  vtd_reg_read(uint64_t addr, uint64_t size) "addr 0x%"PRIx64" size 0x%"PRIx64
  vtd_reg_write(uint64_t addr, uint64_t size, uint64_t val) "addr 0x%"PRIx64" size 0x%"PRIx64" value 0x%"PRIx64
 diff --git a/hw/misc/trace-events b/hw/misc/trace-events
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/misc/trace-events
 +++ b/hw/misc/trace-events
 @@ -XXX,XX +XXX,XX @@
- # @nfs: Since 2.8
+ # See docs/devel/tracing.rst for syntax documentation.
- # @replication: Since 2.8
- # @ssh: Since 2.8
+ # allwinner-cpucfg.c
-+# @iscsi: Since 2.9
+-allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIu32
- #
++allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIx32
- # Since: 2.0
+ allwinner_cpucfg_read(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32
- ##
+ allwinner_cpucfg_write(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32
- { 'enum': 'BlockdevDriver',
-   'data': [ 'archipelago', 'blkdebug', 'blkverify', 'bochs', 'cloop',
+@@ -XXX,XX +XXX,XX @@ imx7_gpr_write(uint64_t offset, uint64_t value) "addr 0x%08" PRIx64 "value 0x%08
-             'dmg', 'file', 'ftp', 'ftps', 'gluster', 'host_cdrom',
--            'host_device', 'http', 'https', 'luks', 'nbd', 'nfs', 'null-aio',
+ # mos6522.c
--            'null-co', 'parallels', 'qcow', 'qcow2', 'qed', 'quorum', 'raw',
+ mos6522_set_counter(int index, unsigned int val) "T%d.counter=%d"
--            'replication', 'ssh', 'vdi', 'vhdx', 'vmdk', 'vpc',
+-mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRId64 " delta_next=0x%"PRId64
--            'vvfat' ] }
++mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRIx64 " delta_next=0x%"PRIx64
-+            'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs',
+ mos6522_set_sr_int(void) "set sr_int"
-+            'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed',
+ mos6522_write(uint64_t addr, const char *name, uint64_t val) "reg=0x%"PRIx64 " [%s] val=0x%"PRIx64
-+            'quorum', 'raw', 'replication', 'ssh', 'vdi', 'vhdx', 'vmdk',
+ mos6522_read(uint64_t addr, const char *name, unsigned val) "reg=0x%"PRIx64 " [%s] val=0x%x"
-+            'vpc', 'vvfat' ] }
+diff --git a/hw/scsi/trace-events b/hw/scsi/trace-events
+index XXXXXXX..XXXXXXX 100644
- ##
+--- a/hw/scsi/trace-events
- # @BlockdevOptionsFile:
++++ b/hw/scsi/trace-events
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ lsi_bad_phase_interrupt(void) "Phase mismatch interrupt"
-             '*logfile': 'str' } }
+ lsi_bad_selection(uint32_t id) "Selected absent target %"PRIu32
+ lsi_do_dma_unavailable(void) "DMA no data available"
- ##
+ lsi_do_dma(uint64_t addr, int len) "DMA addr=0x%"PRIx64" len=%d"
-+# @IscsiTransport:
+-lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRId32
-+#
++lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRIx32
-+# An enumeration of libiscsi transport types
+ lsi_add_msg_byte_error(void) "MSG IN data too long"
-+#
+ lsi_add_msg_byte(uint8_t data) "MSG IN 0x%02x"
-+# Since: 2.9
+ lsi_reselect(int id) "Reselected target %d"
-+##
+@@ -XXX,XX +XXX,XX @@ lsi_do_msgout_noop(void) "MSG: No Operation"
-+{ 'enum': 'IscsiTransport',
+ lsi_do_msgout_extended(uint8_t msg, uint8_t len) "Extended message 0x%x (len %d)"
-+  'data': [ 'tcp', 'iser' ] }
+ lsi_do_msgout_ignored(const char *msg) "%s (ignored)"
-+
+ lsi_do_msgout_simplequeue(uint8_t select_tag) "SIMPLE queue tag=0x%x"
-+##
+-lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRId32
-+# @IscsiHeaderDigest:
++lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRIx32
-+#
+ lsi_do_msgout_clearqueue(uint32_t tag) "MSG: CLEAR QUEUE tag=0x%"PRIx32
-+# An enumeration of header digests supported by libiscsi
+ lsi_do_msgout_busdevicereset(uint32_t tag) "MSG: BUS DEVICE RESET tag=0x%"PRIx32
-+#
+ lsi_do_msgout_select(int id) "Select LUN %d"
 +# Since: 2.9
 +##
 +{ 'enum': 'IscsiHeaderDigest',
 +  'prefix': 'QAPI_ISCSI_HEADER_DIGEST',
 +  'data': [ 'crc32c', 'none', 'crc32c-none', 'none-crc32c' ] }
 +
 +##
 +# @BlockdevOptionsIscsi:
 +#
 +# @transport        The iscsi transport type
 +#
 +# @portal           The address of the iscsi portal
 +#
 +# @target           The target iqn name
 +#
 +# @lun              #optional LUN to connect to. Defaults to 0.
 +#
 +# @user             #optional User name to log in with. If omitted, no CHAP
 +#                   authentication is performed.
 +#
 +# @password-secret  #optional The ID of a QCryptoSecret object providing
 +#                   the password for the login. This option is required if
 +#                   @user is specified.
 +#
 +# @initiator-name   #optional The iqn name we want to identify to the target
 +#                   as. If this option is not specified, an initiator name is
 +#                   generated automatically.
 +#
 +# @header-digest    #optional The desired header digest. Defaults to
 +#                   none-crc32c.
 +#
 +# @timeout          #optional Timeout in seconds after which a request will
 +#                   timeout. 0 means no timeout and is the default.
 +#
 +# Driver specific block device options for iscsi
 +#
 +# Since: 2.9
 +##
 +{ 'struct': 'BlockdevOptionsIscsi',
 +  'data': { 'transport': 'IscsiTransport',
 +            'portal': 'str',
 +            'target': 'str',
 +            '*lun': 'int',
 +            '*user': 'str',
 +            '*password-secret': 'str',
 +            '*initiator-name': 'str',
 +            '*header-digest': 'IscsiHeaderDigest',
 +            '*timeout': 'int' } }
 +
 +##
  # @ReplicationMode:
  #
  # An enumeration of replication modes.
@@ -XXX,XX +XXX,XX @@
        'host_device':'BlockdevOptionsFile',
        'http':       'BlockdevOptionsCurl',
        'https':      'BlockdevOptionsCurl',
 -# TODO iscsi: Wait for structured options
 +      'iscsi':      'BlockdevOptionsIscsi',
        'luks':       'BlockdevOptionsLUKS',
        'nbd':        'BlockdevOptionsNbd',
        'nfs':        'BlockdevOptionsNfs',
 --
-.9.3
+.35.1

-[Qemu-devel] [PULL 7/9] QAPI: Fix blockdev-add example documentation
+Deleted patch
-Signed-off-by: Jeff Cody <jcody@redhat.com>
----
- qapi/block-core.json | 50 +++++++++++++++++++++++++-------------------------
-file changed, 25 insertions(+), 25 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 @@
- # 1.
- # -> { "execute": "blockdev-add",
- #      "arguments": {
--#          "options" : { "driver": "qcow2",
--#                        "file": { "driver": "file",
--#                                  "filename": "test.qcow2" } } } }
-+#           "driver": "qcow2",
-+#           "node-name": "test1",
-+#           "file": {
-+#               "driver": "file",
-+#               "filename": "test.qcow2"
-+#            }
-+#       }
-+#     }
- # <- { "return": {} }
- #
- # 2.
- # -> { "execute": "blockdev-add",
- #      "arguments": {
--#          "options": {
--#            "driver": "qcow2",
--#            "node-name": "node0",
--#            "discard": "unmap",
--#            "cache": {
--#                "direct": true,
--#                "writeback": true
-+#           "driver": "qcow2",
-+#           "node-name": "node0",
-+#           "discard": "unmap",
-+#           "cache": {
-+#              "direct": true
- #            },
- #            "file": {
--#                "driver": "file",
--#                "filename": "/tmp/test.qcow2"
-+#              "driver": "file",
-+#              "filename": "/tmp/test.qcow2"
- #            },
- #            "backing": {
--#                "driver": "raw",
--#                "file": {
--#                    "driver": "file",
--#                    "filename": "/dev/fdset/4"
-+#               "driver": "raw",
-+#               "file": {
-+#                  "driver": "file",
-+#                  "filename": "/dev/fdset/4"
- #                }
- #            }
--#          }
- #        }
- #      }
- #
-@@ -XXX,XX +XXX,XX @@
- #
- # -> { "execute": "blockdev-add",
- #      "arguments": {
--#          "options": {
--#              "driver": "qcow2",
--#              "node-name": "node0",
--#              "file": {
--#                  "driver": "file",
--#                  "filename": "test.qcow2"
--#              }
--#          }
-+#           "driver": "qcow2",
-+#           "node-name": "node0",
-+#           "file": {
-+#               "driver": "file",
-+#               "filename": "test.qcow2"
-+#           }
- #      }
- #    }
- # <- { "return": {} }
---
-.9.3

-[Qemu-devel] [PULL 8/9] mirror: do not increase offset during initial zero_or_discard phase
+Deleted patch
-From: Anton Nefedov <anton.nefedov@virtuozzo.com>
-If explicit zeroing out before mirroring is required for the target image,
-it moves the block job offset counter to EOF, then offset and len counters
-count the image size twice. There is no harm but stats are confusing,
-specifically the progress of the operation is always reported as 99% by
-management tools.
-The patch skips offset increase for the first "technical" pass over the
-image. This should not cause any further harm.
-Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
-Signed-off-by: Denis V. Lunev <den@openvz.org>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Message-id: 1486045515-8009-1-git-send-email-den@openvz.org
-CC: Jeff Cody <jcody@redhat.com>
-CC: Kevin Wolf <kwolf@redhat.com>
-CC: Max Reitz <mreitz@redhat.com>
-CC: Eric Blake <eblake@redhat.com>
-Signed-off-by: Jeff Cody <jcody@redhat.com>
----
- block/mirror.c | 9 +++++++--
-file changed, 7 insertions(+), 2 deletions(-)
-diff --git a/block/mirror.c b/block/mirror.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/mirror.c
-+++ b/block/mirror.c
-@@ -XXX,XX +XXX,XX @@ typedef struct MirrorBlockJob {
-     bool waiting_for_io;
-     int target_cluster_sectors;
-     int max_iov;
-+    bool initial_zeroing_ongoing;
- } MirrorBlockJob;
- typedef struct MirrorOp {
-@@ -XXX,XX +XXX,XX @@ static void mirror_iteration_done(MirrorOp *op, int ret)
-         if (s->cow_bitmap) {
-             bitmap_set(s->cow_bitmap, chunk_num, nb_chunks);
-         }
--        s->common.offset += (uint64_t)op->nb_sectors * BDRV_SECTOR_SIZE;
-+        if (!s->initial_zeroing_ongoing) {
-+            s->common.offset += (uint64_t)op->nb_sectors * BDRV_SECTOR_SIZE;
-+        }
-     }
--
-     qemu_iovec_destroy(&op->qiov);
-     g_free(op);
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)
-             return 0;
-         }
-+        s->initial_zeroing_ongoing = true;
-         for (sector_num = 0; sector_num < end; ) {
-             int nb_sectors = MIN(end - sector_num,
-                 QEMU_ALIGN_DOWN(INT_MAX, s->granularity) >> BDRV_SECTOR_BITS);
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)
-             mirror_throttle(s);
-             if (block_job_is_cancelled(&s->common)) {
-+                s->initial_zeroing_ongoing = false;
-                 return 0;
-             }
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)
-         }
-         mirror_wait_for_all_io(s);
-+        s->initial_zeroing_ongoing = false;
-     }
-     /* First part, loop on the sectors and initialize the dirty bitmap.  */
---
-.9.3

The following changes since commit a1cf5fac2b929ffa2abd1285401f2535ff8c6fea:

Merge remote-tracking branch 'remotes/armbru/tags/pull-block-2017-02-21' into staging (2017-02-21 13:58:50 +0000)

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 6135c5e12606b8413708384e3e7d43f6010c5941:

qemu-options: Fix broken sheepdog URL (2017-02-21 10:38:09 -0500)

----------------------------------------------------------------
Block patches
----------------------------------------------------------------

Anton Nefedov (1):
  mirror: do not increase offset during initial zero_or_discard phase

Jeff Cody (1):
  QAPI: Fix blockdev-add example documentation

Kevin Wolf (6):
  iscsi: Split URL into individual options
  iscsi: Handle -iscsi user/password in bdrv_parse_filename()
  iscsi: Add initiator-name option
  iscsi: Add header-digest option
  iscsi: Add timeout option
  iscsi: Add blockdev-add support

Thomas Huth (1):
  qemu-options: Fix broken sheepdog URL

block/iscsi.c        | 353 +++++++++++++++++++++++++++++++--------------------
 block/mirror.c       |   9 +-
 qapi/block-core.json | 125 +++++++++++++-----
 qemu-options.hx      |   2 +-
 4 files changed, 317 insertions(+), 172 deletions(-)

-- 
2.9.3

From: Kevin Wolf <kwolf@redhat.com>

This introduces a .bdrv_parse_filename handler for iscsi which parses an
URL if given and translates it to individual options.

Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/iscsi.c | 193 ++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 140 insertions(+), 53 deletions(-)

diff --git a/block/iscsi.c b/block/iscsi.c
index XXXXXXX..XXXXXXX 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -XXX,XX +XXX,XX @@ static void iscsi_readcapacity_sync(IscsiLun *iscsilun, Error **errp)
     }
 }
 
-/* TODO Convert to fine grained options */
-static QemuOptsList runtime_opts = {
-    .name = "iscsi",
-    .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
-    .desc = {
-        {
-            .name = "filename",
-            .type = QEMU_OPT_STRING,
-            .help = "URL to the iscsi image",
-        },
-        { /* end of list */ }
-    },
-};
-
 static struct scsi_task *iscsi_do_inquiry(struct iscsi_context *iscsi, int lun,
                                           int evpd, int pc, void **inq, Error **errp)
 {
@@ -XXX,XX +XXX,XX @@ out:
  * We support iscsi url's on the form
  * iscsi://[<username>%<password>@]<host>[:<port>]/<targetname>/<lun>
  */
+static void iscsi_parse_filename(const char *filename, QDict *options,
+                                 Error **errp)
+{
+    struct iscsi_url *iscsi_url;
+    const char *transport_name;
+    char *lun_str;
+
+    iscsi_url = iscsi_parse_full_url(NULL, filename);
+    if (iscsi_url == NULL) {
+        error_setg(errp, "Failed to parse URL : %s", filename);
+        return;
+    }
+
+#if LIBISCSI_API_VERSION >= (20160603)
+    switch (iscsi_url->transport) {
+    case TCP_TRANSPORT:
+        transport_name = "tcp";
+        break;
+    case ISER_TRANSPORT:
+        transport_name = "iser";
+        break;
+    default:
+        error_setg(errp, "Unknown transport type (%d)",
+                   iscsi_url->transport);
+        return;
+    }
+#else
+    transport_name = "tcp";
+#endif
+
+    qdict_set_default_str(options, "transport", transport_name);
+    qdict_set_default_str(options, "portal", iscsi_url->portal);
+    qdict_set_default_str(options, "target", iscsi_url->target);
+
+    lun_str = g_strdup_printf("%d", iscsi_url->lun);
+    qdict_set_default_str(options, "lun", lun_str);
+    g_free(lun_str);
+
+    if (iscsi_url->user[0] != '\0') {
+        qdict_set_default_str(options, "user", iscsi_url->user);
+        qdict_set_default_str(options, "password", iscsi_url->passwd);
+    }
+
+    iscsi_destroy_url(iscsi_url);
+}
+
+/* TODO Add -iscsi options */
+static QemuOptsList runtime_opts = {
+    .name = "iscsi",
+    .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
+    .desc = {
+        {
+            .name = "transport",
+            .type = QEMU_OPT_STRING,
+        },
+        {
+            .name = "portal",
+            .type = QEMU_OPT_STRING,
+        },
+        {
+            .name = "target",
+            .type = QEMU_OPT_STRING,
+        },
+        {
+            .name = "user",
+            .type = QEMU_OPT_STRING,
+        },
+        {
+            .name = "password",
+            .type = QEMU_OPT_STRING,
+        },
+        {
+            .name = "lun",
+            .type = QEMU_OPT_NUMBER,
+        },
+        { /* end of list */ }
+    },
+};
+
 static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
                       Error **errp)
 {
     IscsiLun *iscsilun = bs->opaque;
     struct iscsi_context *iscsi = NULL;
-    struct iscsi_url *iscsi_url = NULL;
     struct scsi_task *task = NULL;
     struct scsi_inquiry_standard *inq = NULL;
     struct scsi_inquiry_supported_pages *inq_vpd;
     char *initiator_name = NULL;
     QemuOpts *opts;
     Error *local_err = NULL;
-    const char *filename;
-    int i, ret = 0, timeout = 0;
+    const char *transport_name, *portal, *target;
+    const char *user, *password;
+#if LIBISCSI_API_VERSION >= (20160603)
+    enum iscsi_transport_type transport;
+#endif
+    int i, ret = 0, timeout = 0, lun;
 
     opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
     qemu_opts_absorb_qdict(opts, options, &local_err);
@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
         goto out;
     }
 
-    filename = qemu_opt_get(opts, "filename");
+    transport_name = qemu_opt_get(opts, "transport");
+    portal = qemu_opt_get(opts, "portal");
+    target = qemu_opt_get(opts, "target");
+    user = qemu_opt_get(opts, "user");
+    password = qemu_opt_get(opts, "password");
+    lun = qemu_opt_get_number(opts, "lun", 0);
 
-    iscsi_url = iscsi_parse_full_url(iscsi, filename);
-    if (iscsi_url == NULL) {
-        error_setg(errp, "Failed to parse URL : %s", filename);
+    if (!transport_name || !portal || !target) {
+        error_setg(errp, "Need all of transport, portal and target options");
+        ret = -EINVAL;
+        goto out;
+    }
+    if (user && !password) {
+        error_setg(errp, "If a user name is given, a password is required");
+        ret = -EINVAL;
+        goto out;
+    }
+
+    if (!strcmp(transport_name, "tcp")) {
+#if LIBISCSI_API_VERSION >= (20160603)
+        transport = TCP_TRANSPORT;
+    } else if (!strcmp(transport_name, "iser")) {
+        transport = ISER_TRANSPORT;
+#else
+        /* TCP is what older libiscsi versions always use */
+#endif
+    } else {
+        error_setg(errp, "Unknown transport: %s", transport_name);
         ret = -EINVAL;
         goto out;
     }
 
     memset(iscsilun, 0, sizeof(IscsiLun));
 
-    initiator_name = parse_initiator_name(iscsi_url->target);
+    initiator_name = parse_initiator_name(target);
 
     iscsi = iscsi_create_context(initiator_name);
     if (iscsi == NULL) {
@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
         goto out;
     }
 #if LIBISCSI_API_VERSION >= (20160603)
-    if (iscsi_init_transport(iscsi, iscsi_url->transport)) {
+    if (iscsi_init_transport(iscsi, transport)) {
         error_setg(errp, ("Error initializing transport."));
         ret = -EINVAL;
         goto out;
     }
 #endif
-    if (iscsi_set_targetname(iscsi, iscsi_url->target)) {
+    if (iscsi_set_targetname(iscsi, target)) {
         error_setg(errp, "iSCSI: Failed to set target name.");
         ret = -EINVAL;
         goto out;
     }
 
-    if (iscsi_url->user[0] != '\0') {
-        ret = iscsi_set_initiator_username_pwd(iscsi, iscsi_url->user,
-                                              iscsi_url->passwd);
+    if (user) {
+        ret = iscsi_set_initiator_username_pwd(iscsi, user, password);
         if (ret != 0) {
             error_setg(errp, "Failed to set initiator username and password");
             ret = -EINVAL;
@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
     }
 
     /* check if we got CHAP username/password via the options */
-    parse_chap(iscsi, iscsi_url->target, &local_err);
+    parse_chap(iscsi, target, &local_err);
     if (local_err != NULL) {
         error_propagate(errp, local_err);
         ret = -EINVAL;
@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
     iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
 
     /* check if we got HEADER_DIGEST via the options */
-    parse_header_digest(iscsi, iscsi_url->target, &local_err);
+    parse_header_digest(iscsi, target, &local_err);
     if (local_err != NULL) {
         error_propagate(errp, local_err);
         ret = -EINVAL;
@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
     }
 
     /* timeout handling is broken in libiscsi before 1.15.0 */
-    timeout = parse_timeout(iscsi_url->target);
+    timeout = parse_timeout(target);
 #if LIBISCSI_API_VERSION >= 20150621
     iscsi_set_timeout(iscsi, timeout);
 #else
@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
     }
 #endif
 
-    if (iscsi_full_connect_sync(iscsi, iscsi_url->portal, iscsi_url->lun) != 0) {
+    if (iscsi_full_connect_sync(iscsi, portal, lun) != 0) {
         error_setg(errp, "iSCSI: Failed to connect to LUN : %s",
             iscsi_get_error(iscsi));
         ret = -EINVAL;
@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
 
     iscsilun->iscsi = iscsi;
     iscsilun->aio_context = bdrv_get_aio_context(bs);
-    iscsilun->lun   = iscsi_url->lun;
+    iscsilun->lun = lun;
     iscsilun->has_write_same = true;
 
     task = iscsi_do_inquiry(iscsilun->iscsi, iscsilun->lun, 0, 0,
@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
 out:
     qemu_opts_del(opts);
     g_free(initiator_name);
-    if (iscsi_url != NULL) {
-        iscsi_destroy_url(iscsi_url);
-    }
     if (task != NULL) {
         scsi_free_scsi_task(task);
     }
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_iscsi = {
     .format_name     = "iscsi",
     .protocol_name   = "iscsi",
 
-    .instance_size   = sizeof(IscsiLun),
-    .bdrv_needs_filename = true,
-    .bdrv_file_open  = iscsi_open,
-    .bdrv_close      = iscsi_close,
-    .bdrv_create     = iscsi_create,
-    .create_opts     = &iscsi_create_opts,
-    .bdrv_reopen_prepare   = iscsi_reopen_prepare,
-    .bdrv_reopen_commit    = iscsi_reopen_commit,
-    .bdrv_invalidate_cache = iscsi_invalidate_cache,
+    .instance_size          = sizeof(IscsiLun),
+    .bdrv_parse_filename    = iscsi_parse_filename,
+    .bdrv_file_open         = iscsi_open,
+    .bdrv_close             = iscsi_close,
+    .bdrv_create            = iscsi_create,
+    .create_opts            = &iscsi_create_opts,
+    .bdrv_reopen_prepare    = iscsi_reopen_prepare,
+    .bdrv_reopen_commit     = iscsi_reopen_commit,
+    .bdrv_invalidate_cache  = iscsi_invalidate_cache,
 
     .bdrv_getlength  = iscsi_getlength,
     .bdrv_get_info   = iscsi_get_info,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_iser = {
     .format_name     = "iser",
     .protocol_name   = "iser",
 
-    .instance_size   = sizeof(IscsiLun),
-    .bdrv_needs_filename = true,
-    .bdrv_file_open  = iscsi_open,
-    .bdrv_close      = iscsi_close,
-    .bdrv_create     = iscsi_create,
-    .create_opts     = &iscsi_create_opts,
-    .bdrv_reopen_prepare   = iscsi_reopen_prepare,
-    .bdrv_reopen_commit    = iscsi_reopen_commit,
-    .bdrv_invalidate_cache = iscsi_invalidate_cache,
+    .instance_size          = sizeof(IscsiLun),
+    .bdrv_parse_filename    = iscsi_parse_filename,
+    .bdrv_file_open         = iscsi_open,
+    .bdrv_close             = iscsi_close,
+    .bdrv_create            = iscsi_create,
+    .create_opts            = &iscsi_create_opts,
+    .bdrv_reopen_prepare    = iscsi_reopen_prepare,
+    .bdrv_reopen_commit     = iscsi_reopen_commit,
+    .bdrv_invalidate_cache  = iscsi_invalidate_cache,
 
     .bdrv_getlength  = iscsi_getlength,
     .bdrv_get_info   = iscsi_get_info,
-- 
2.9.3

From: Kevin Wolf <kwolf@redhat.com>

This splits the logic in the old parse_chap() function into a part that
parses the -iscsi options into the new driver-specific options, and
another part that actually applies those options (called apply_chap()
now).

Note that this means that username and password specified with -iscsi
only take effect when a URL is provided. This is intentional, -iscsi is
a legacy interface only supported for compatibility, new users should
use the proper driver-specific options.

Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/iscsi.c | 78 +++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 44 insertions(+), 34 deletions(-)

diff --git a/block/iscsi.c b/block/iscsi.c
index XXXXXXX..XXXXXXX 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -XXX,XX +XXX,XX @@ retry:
     return 0;
 }
 
-static void parse_chap(struct iscsi_context *iscsi, const char *target,
+static void apply_chap(struct iscsi_context *iscsi, QemuOpts *opts,
                        Error **errp)
 {
-    QemuOptsList *list;
-    QemuOpts *opts;
     const char *user = NULL;
     const char *password = NULL;
     const char *secretid;
     char *secret = NULL;
 
-    list = qemu_find_opts("iscsi");
-    if (!list) {
-        return;
-    }
-
-    opts = qemu_opts_find(list, target);
-    if (opts == NULL) {
-        opts = QTAILQ_FIRST(&list->head);
-        if (!opts) {
-            return;
-        }
-    }
-
     user = qemu_opt_get(opts, "user");
     if (!user) {
         return;
@@ -XXX,XX +XXX,XX @@ out:
     }
 }
 
+static void iscsi_parse_iscsi_option(const char *target, QDict *options)
+{
+    QemuOptsList *list;
+    QemuOpts *opts;
+    const char *user, *password, *password_secret;
+
+    list = qemu_find_opts("iscsi");
+    if (!list) {
+        return;
+    }
+
+    opts = qemu_opts_find(list, target);
+    if (opts == NULL) {
+        opts = QTAILQ_FIRST(&list->head);
+        if (!opts) {
+            return;
+        }
+    }
+
+    user = qemu_opt_get(opts, "user");
+    if (user) {
+        qdict_set_default_str(options, "user", user);
+    }
+
+    password = qemu_opt_get(opts, "password");
+    if (password) {
+        qdict_set_default_str(options, "password", password);
+    }
+
+    password_secret = qemu_opt_get(opts, "password-secret");
+    if (password_secret) {
+        qdict_set_default_str(options, "password-secret", password_secret);
+    }
+}
+
 /*
  * We support iscsi url's on the form
  * iscsi://[<username>%<password>@]<host>[:<port>]/<targetname>/<lun>
@@ -XXX,XX +XXX,XX @@ static void iscsi_parse_filename(const char *filename, QDict *options,
     qdict_set_default_str(options, "lun", lun_str);
     g_free(lun_str);
 
+    /* User/password from -iscsi take precedence over those from the URL */
+    iscsi_parse_iscsi_option(iscsi_url->target, options);
+
     if (iscsi_url->user[0] != '\0') {
         qdict_set_default_str(options, "user", iscsi_url->user);
         qdict_set_default_str(options, "password", iscsi_url->passwd);
@@ -XXX,XX +XXX,XX @@ static QemuOptsList runtime_opts = {
             .type = QEMU_OPT_STRING,
         },
         {
+            .name = "password-secret",
+            .type = QEMU_OPT_STRING,
+        },
+        {
             .name = "lun",
             .type = QEMU_OPT_NUMBER,
         },
@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
     QemuOpts *opts;
     Error *local_err = NULL;
     const char *transport_name, *portal, *target;
-    const char *user, *password;
 #if LIBISCSI_API_VERSION >= (20160603)
     enum iscsi_transport_type transport;
 #endif
@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
     transport_name = qemu_opt_get(opts, "transport");
     portal = qemu_opt_get(opts, "portal");
     target = qemu_opt_get(opts, "target");
-    user = qemu_opt_get(opts, "user");
-    password = qemu_opt_get(opts, "password");
     lun = qemu_opt_get_number(opts, "lun", 0);
 
     if (!transport_name || !portal || !target) {
@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
         ret = -EINVAL;
         goto out;
     }
-    if (user && !password) {
-        error_setg(errp, "If a user name is given, a password is required");
-        ret = -EINVAL;
-        goto out;
-    }
 
     if (!strcmp(transport_name, "tcp")) {
 #if LIBISCSI_API_VERSION >= (20160603)
@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
         goto out;
     }
 
-    if (user) {
-        ret = iscsi_set_initiator_username_pwd(iscsi, user, password);
-        if (ret != 0) {
-            error_setg(errp, "Failed to set initiator username and password");
-            ret = -EINVAL;
-            goto out;
-        }
-    }
-
     /* check if we got CHAP username/password via the options */
-    parse_chap(iscsi, target, &local_err);
+    apply_chap(iscsi, opts, &local_err);
     if (local_err != NULL) {
         error_propagate(errp, local_err);
         ret = -EINVAL;
-- 
2.9.3

From: Kevin Wolf <kwolf@redhat.com>

This was previously only available with -iscsi. Again, after this patch,
the -iscsi option only takes effect if an URL is given. New users are
supposed to use the new driver-specific option.

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/iscsi.c | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/block/iscsi.c b/block/iscsi.c
index XXXXXXX..XXXXXXX 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -XXX,XX +XXX,XX @@ static void parse_header_digest(struct iscsi_context *iscsi, const char *target,
     }
 }
 
-static char *parse_initiator_name(const char *target)
+static char *get_initiator_name(QemuOpts *opts)
 {
-    QemuOptsList *list;
-    QemuOpts *opts;
     const char *name;
     char *iscsi_name;
     UuidInfo *uuid_info;
 
-    list = qemu_find_opts("iscsi");
-    if (list) {
-        opts = qemu_opts_find(list, target);
-        if (!opts) {
-            opts = QTAILQ_FIRST(&list->head);
-        }
-        if (opts) {
-            name = qemu_opt_get(opts, "initiator-name");
-            if (name) {
-                return g_strdup(name);
-            }
-        }
+    name = qemu_opt_get(opts, "initiator-name");
+    if (name) {
+        return g_strdup(name);
     }
 
     uuid_info = qmp_query_uuid(NULL);
@@ -XXX,XX +XXX,XX @@ static void iscsi_parse_iscsi_option(const char *target, QDict *options)
 {
     QemuOptsList *list;
     QemuOpts *opts;
-    const char *user, *password, *password_secret;
+    const char *user, *password, *password_secret, *initiator_name;
 
     list = qemu_find_opts("iscsi");
     if (!list) {
@@ -XXX,XX +XXX,XX @@ static void iscsi_parse_iscsi_option(const char *target, QDict *options)
     if (password_secret) {
         qdict_set_default_str(options, "password-secret", password_secret);
     }
+
+    initiator_name = qemu_opt_get(opts, "initiator-name");
+    if (initiator_name) {
+        qdict_set_default_str(options, "initiator-name", initiator_name);
+    }
 }
 
 /*
@@ -XXX,XX +XXX,XX @@ static QemuOptsList runtime_opts = {
             .name = "lun",
             .type = QEMU_OPT_NUMBER,
         },
+        {
+            .name = "initiator-name",
+            .type = QEMU_OPT_STRING,
+        },
         { /* end of list */ }
     },
 };
@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
 
     memset(iscsilun, 0, sizeof(IscsiLun));
 
-    initiator_name = parse_initiator_name(target);
+    initiator_name = get_initiator_name(opts);
 
     iscsi = iscsi_create_context(initiator_name);
     if (iscsi == NULL) {
-- 
2.9.3

From: Kevin Wolf <kwolf@redhat.com>

This was previously only available with -iscsi. Again, after this patch,
the -iscsi option only takes effect if an URL is given. New users are
supposed to use the new driver-specific option.

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/iscsi.c | 39 +++++++++++++++------------------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/block/iscsi.c b/block/iscsi.c
index XXXXXXX..XXXXXXX 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -XXX,XX +XXX,XX @@ static void apply_chap(struct iscsi_context *iscsi, QemuOpts *opts,
     g_free(secret);
 }
 
-static void parse_header_digest(struct iscsi_context *iscsi, const char *target,
+static void apply_header_digest(struct iscsi_context *iscsi, QemuOpts *opts,
                                 Error **errp)
 {
-    QemuOptsList *list;
-    QemuOpts *opts;
     const char *digest = NULL;
 
-    list = qemu_find_opts("iscsi");
-    if (!list) {
-        return;
-    }
-
-    opts = qemu_opts_find(list, target);
-    if (opts == NULL) {
-        opts = QTAILQ_FIRST(&list->head);
-        if (!opts) {
-            return;
-        }
-    }
-
     digest = qemu_opt_get(opts, "header-digest");
     if (!digest) {
-        return;
-    }
-
-    if (!strcmp(digest, "CRC32C")) {
+        iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
+    } else if (!strcmp(digest, "CRC32C")) {
         iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_CRC32C);
     } else if (!strcmp(digest, "NONE")) {
         iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE);
@@ -XXX,XX +XXX,XX @@ static void iscsi_parse_iscsi_option(const char *target, QDict *options)
 {
     QemuOptsList *list;
     QemuOpts *opts;
-    const char *user, *password, *password_secret, *initiator_name;
+    const char *user, *password, *password_secret, *initiator_name,
+               *header_digest;
 
     list = qemu_find_opts("iscsi");
     if (!list) {
@@ -XXX,XX +XXX,XX @@ static void iscsi_parse_iscsi_option(const char *target, QDict *options)
     if (initiator_name) {
         qdict_set_default_str(options, "initiator-name", initiator_name);
     }
+
+    header_digest = qemu_opt_get(opts, "header-digest");
+    if (header_digest) {
+        qdict_set_default_str(options, "header-digest", header_digest);
+    }
 }
 
 /*
@@ -XXX,XX +XXX,XX @@ static QemuOptsList runtime_opts = {
             .name = "initiator-name",
             .type = QEMU_OPT_STRING,
         },
+        {
+            .name = "header-digest",
+            .type = QEMU_OPT_STRING,
+        },
         { /* end of list */ }
     },
 };
@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
         goto out;
     }
 
-    iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
-
     /* check if we got HEADER_DIGEST via the options */
-    parse_header_digest(iscsi, target, &local_err);
+    apply_header_digest(iscsi, opts, &local_err);
     if (local_err != NULL) {
         error_propagate(errp, local_err);
         ret = -EINVAL;
-- 
2.9.3

From: Kevin Wolf <kwolf@redhat.com>

This was previously only available with -iscsi. Again, after this patch,
the -iscsi option only takes effect if an URL is given. New users are
supposed to use the new driver-specific option.

All -iscsi options have a corresponding driver-specific option for the
iscsi block driver now.

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/iscsi.c | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/block/iscsi.c b/block/iscsi.c
index XXXXXXX..XXXXXXX 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -XXX,XX +XXX,XX @@ static char *get_initiator_name(QemuOpts *opts)
     return iscsi_name;
 }
 
-static int parse_timeout(const char *target)
-{
-    QemuOptsList *list;
-    QemuOpts *opts;
-    const char *timeout;
-
-    list = qemu_find_opts("iscsi");
-    if (list) {
-        opts = qemu_opts_find(list, target);
-        if (!opts) {
-            opts = QTAILQ_FIRST(&list->head);
-        }
-        if (opts) {
-            timeout = qemu_opt_get(opts, "timeout");
-            if (timeout) {
-                return atoi(timeout);
-            }
-        }
-    }
-
-    return 0;
-}
-
 static void iscsi_nop_timed_event(void *opaque)
 {
     IscsiLun *iscsilun = opaque;
@@ -XXX,XX +XXX,XX @@ static void iscsi_parse_iscsi_option(const char *target, QDict *options)
     QemuOptsList *list;
     QemuOpts *opts;
     const char *user, *password, *password_secret, *initiator_name,
-               *header_digest;
+               *header_digest, *timeout;
 
     list = qemu_find_opts("iscsi");
     if (!list) {
@@ -XXX,XX +XXX,XX @@ static void iscsi_parse_iscsi_option(const char *target, QDict *options)
     if (header_digest) {
         qdict_set_default_str(options, "header-digest", header_digest);
     }
+
+    timeout = qemu_opt_get(opts, "timeout");
+    if (timeout) {
+        qdict_set_default_str(options, "timeout", timeout);
+    }
 }
 
 /*
@@ -XXX,XX +XXX,XX @@ static void iscsi_parse_filename(const char *filename, QDict *options,
     iscsi_destroy_url(iscsi_url);
 }
 
-/* TODO Add -iscsi options */
 static QemuOptsList runtime_opts = {
     .name = "iscsi",
     .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
@@ -XXX,XX +XXX,XX @@ static QemuOptsList runtime_opts = {
             .name = "header-digest",
             .type = QEMU_OPT_STRING,
         },
+        {
+            .name = "timeout",
+            .type = QEMU_OPT_NUMBER,
+        },
         { /* end of list */ }
     },
 };
@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
     }
 
     /* timeout handling is broken in libiscsi before 1.15.0 */
-    timeout = parse_timeout(target);
+    timeout = qemu_opt_get_number(opts, "timeout", 0);
 #if LIBISCSI_API_VERSION >= 20150621
     iscsi_set_timeout(iscsi, timeout);
 #else
-- 
2.9.3

From: Kevin Wolf <kwolf@redhat.com>

This adds blockdev-add support for iscsi devices.

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/iscsi.c        | 14 ++++++----
 qapi/block-core.json | 75 ++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 79 insertions(+), 10 deletions(-)

diff --git a/block/iscsi.c b/block/iscsi.c
index XXXXXXX..XXXXXXX 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -XXX,XX +XXX,XX @@ static void apply_header_digest(struct iscsi_context *iscsi, QemuOpts *opts,
     digest = qemu_opt_get(opts, "header-digest");
     if (!digest) {
         iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
-    } else if (!strcmp(digest, "CRC32C")) {
+    } else if (!strcmp(digest, "crc32c")) {
         iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_CRC32C);
-    } else if (!strcmp(digest, "NONE")) {
+    } else if (!strcmp(digest, "none")) {
         iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE);
-    } else if (!strcmp(digest, "CRC32C-NONE")) {
+    } else if (!strcmp(digest, "crc32c-none")) {
         iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_CRC32C_NONE);
-    } else if (!strcmp(digest, "NONE-CRC32C")) {
+    } else if (!strcmp(digest, "none-crc32c")) {
         iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
     } else {
         error_setg(errp, "Invalid header-digest setting : %s", digest);
@@ -XXX,XX +XXX,XX @@ static void iscsi_parse_iscsi_option(const char *target, QDict *options)
 
     header_digest = qemu_opt_get(opts, "header-digest");
     if (header_digest) {
-        qdict_set_default_str(options, "header-digest", header_digest);
+        /* -iscsi takes upper case values, but QAPI only supports lower case
+         * enum constant names, so we have to convert here. */
+        char *qapi_value = g_ascii_strdown(header_digest, -1);
+        qdict_set_default_str(options, "header-digest", qapi_value);
+        g_free(qapi_value);
     }
 
     timeout = qemu_opt_get(opts, "timeout");
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 @@
 # @nfs: Since 2.8
 # @replication: Since 2.8
 # @ssh: Since 2.8
+# @iscsi: Since 2.9
 #
 # Since: 2.0
 ##
 { 'enum': 'BlockdevDriver',
   'data': [ 'archipelago', 'blkdebug', 'blkverify', 'bochs', 'cloop',
             'dmg', 'file', 'ftp', 'ftps', 'gluster', 'host_cdrom',
-            'host_device', 'http', 'https', 'luks', 'nbd', 'nfs', 'null-aio',
-            'null-co', 'parallels', 'qcow', 'qcow2', 'qed', 'quorum', 'raw',
-            'replication', 'ssh', 'vdi', 'vhdx', 'vmdk', 'vpc',
-            'vvfat' ] }
+            'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs',
+            'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed',
+            'quorum', 'raw', 'replication', 'ssh', 'vdi', 'vhdx', 'vmdk',
+            'vpc', 'vvfat' ] }
 
 ##
 # @BlockdevOptionsFile:
@@ -XXX,XX +XXX,XX @@
             '*logfile': 'str' } }
 
 ##
+# @IscsiTransport:
+#
+# An enumeration of libiscsi transport types
+#
+# Since: 2.9
+##
+{ 'enum': 'IscsiTransport',
+  'data': [ 'tcp', 'iser' ] }
+
+##
+# @IscsiHeaderDigest:
+#
+# An enumeration of header digests supported by libiscsi
+#
+# Since: 2.9
+##
+{ 'enum': 'IscsiHeaderDigest',
+  'prefix': 'QAPI_ISCSI_HEADER_DIGEST',
+  'data': [ 'crc32c', 'none', 'crc32c-none', 'none-crc32c' ] }
+
+##
+# @BlockdevOptionsIscsi:
+#
+# @transport        The iscsi transport type
+#
+# @portal           The address of the iscsi portal
+#
+# @target           The target iqn name
+#
+# @lun              #optional LUN to connect to. Defaults to 0.
+#
+# @user             #optional User name to log in with. If omitted, no CHAP
+#                   authentication is performed.
+#
+# @password-secret  #optional The ID of a QCryptoSecret object providing
+#                   the password for the login. This option is required if
+#                   @user is specified.
+#
+# @initiator-name   #optional The iqn name we want to identify to the target
+#                   as. If this option is not specified, an initiator name is
+#                   generated automatically.
+#
+# @header-digest    #optional The desired header digest. Defaults to
+#                   none-crc32c.
+#
+# @timeout          #optional Timeout in seconds after which a request will
+#                   timeout. 0 means no timeout and is the default.
+#
+# Driver specific block device options for iscsi
+#
+# Since: 2.9
+##
+{ 'struct': 'BlockdevOptionsIscsi',
+  'data': { 'transport': 'IscsiTransport',
+            'portal': 'str',
+            'target': 'str',
+            '*lun': 'int',
+            '*user': 'str',
+            '*password-secret': 'str',
+            '*initiator-name': 'str',
+            '*header-digest': 'IscsiHeaderDigest',
+            '*timeout': 'int' } }
+
+##
 # @ReplicationMode:
 #
 # An enumeration of replication modes.
@@ -XXX,XX +XXX,XX @@
       'host_device':'BlockdevOptionsFile',
       'http':       'BlockdevOptionsCurl',
       'https':      'BlockdevOptionsCurl',
-# TODO iscsi: Wait for structured options
+      'iscsi':      'BlockdevOptionsIscsi',
       'luks':       'BlockdevOptionsLUKS',
       'nbd':        'BlockdevOptionsNbd',
       'nfs':        'BlockdevOptionsNfs',
-- 
2.9.3

Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 qapi/block-core.json | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 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 @@
 # 1.
 # -> { "execute": "blockdev-add",
 #      "arguments": {
-#          "options" : { "driver": "qcow2",
-#                        "file": { "driver": "file",
-#                                  "filename": "test.qcow2" } } } }
+#           "driver": "qcow2",
+#           "node-name": "test1",
+#           "file": {
+#               "driver": "file",
+#               "filename": "test.qcow2"
+#            }
+#       }
+#     }
 # <- { "return": {} }
 #
 # 2.
 # -> { "execute": "blockdev-add",
 #      "arguments": {
-#          "options": {
-#            "driver": "qcow2",
-#            "node-name": "node0",
-#            "discard": "unmap",
-#            "cache": {
-#                "direct": true,
-#                "writeback": true
+#           "driver": "qcow2",
+#           "node-name": "node0",
+#           "discard": "unmap",
+#           "cache": {
+#              "direct": true
 #            },
 #            "file": {
-#                "driver": "file",
-#                "filename": "/tmp/test.qcow2"
+#              "driver": "file",
+#              "filename": "/tmp/test.qcow2"
 #            },
 #            "backing": {
-#                "driver": "raw",
-#                "file": {
-#                    "driver": "file",
-#                    "filename": "/dev/fdset/4"
+#               "driver": "raw",
+#               "file": {
+#                  "driver": "file",
+#                  "filename": "/dev/fdset/4"
 #                }
 #            }
-#          }
 #        }
 #      }
 #
@@ -XXX,XX +XXX,XX @@
 #
 # -> { "execute": "blockdev-add",
 #      "arguments": {
-#          "options": {
-#              "driver": "qcow2",
-#              "node-name": "node0",
-#              "file": {
-#                  "driver": "file",
-#                  "filename": "test.qcow2"
-#              }
-#          }
+#           "driver": "qcow2",
+#           "node-name": "node0",
+#           "file": {
+#               "driver": "file",
+#               "filename": "test.qcow2"
+#           }
 #      }
 #    }
 # <- { "return": {} }
-- 
2.9.3

From: Anton Nefedov <anton.nefedov@virtuozzo.com>

If explicit zeroing out before mirroring is required for the target image,
it moves the block job offset counter to EOF, then offset and len counters
count the image size twice. There is no harm but stats are confusing,
specifically the progress of the operation is always reported as 99% by
management tools.

The patch skips offset increase for the first "technical" pass over the
image. This should not cause any further harm.

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1486045515-8009-1-git-send-email-den@openvz.org
CC: Jeff Cody <jcody@redhat.com>
CC: Kevin Wolf <kwolf@redhat.com>
CC: Max Reitz <mreitz@redhat.com>
CC: Eric Blake <eblake@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/mirror.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/block/mirror.c b/block/mirror.c
index XXXXXXX..XXXXXXX 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -XXX,XX +XXX,XX @@ typedef struct MirrorBlockJob {
     bool waiting_for_io;
     int target_cluster_sectors;
     int max_iov;
+    bool initial_zeroing_ongoing;
 } MirrorBlockJob;
 
 typedef struct MirrorOp {
@@ -XXX,XX +XXX,XX @@ static void mirror_iteration_done(MirrorOp *op, int ret)
         if (s->cow_bitmap) {
             bitmap_set(s->cow_bitmap, chunk_num, nb_chunks);
         }
-        s->common.offset += (uint64_t)op->nb_sectors * BDRV_SECTOR_SIZE;
+        if (!s->initial_zeroing_ongoing) {
+            s->common.offset += (uint64_t)op->nb_sectors * BDRV_SECTOR_SIZE;
+        }
     }
-
     qemu_iovec_destroy(&op->qiov);
     g_free(op);
 
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)
             return 0;
         }
 
+        s->initial_zeroing_ongoing = true;
         for (sector_num = 0; sector_num < end; ) {
             int nb_sectors = MIN(end - sector_num,
                 QEMU_ALIGN_DOWN(INT_MAX, s->granularity) >> BDRV_SECTOR_BITS);
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)
             mirror_throttle(s);
 
             if (block_job_is_cancelled(&s->common)) {
+                s->initial_zeroing_ongoing = false;
                 return 0;
             }
 
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)
         }
 
         mirror_wait_for_all_io(s);
+        s->initial_zeroing_ongoing = false;
     }
 
     /* First part, loop on the sectors and initialize the dirty bitmap.  */
-- 
2.9.3

The following changes since commit 15ef89d2a1a7b93845a6b09c2ee8e1979f6eb30b:

Update version for v7.0.0-rc1 release (2022-03-22 22:58:44 +0000)

are available in the Git repository at:

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

for you to fetch changes up to 2539eade4f689eda7e9fe45486f18334bfbafaf0:

hw: Fix misleading hexadecimal format (2022-03-24 10:38:42 +0000)

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

Philippe found cases where the 0x%d format string was used, leading to
misleading output. The patches look harmless and could save people time, so I
think it's worth including them in 7.0.

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

Philippe Mathieu-Daudé (2):
  block: Fix misleading hexadecimal format
  hw: Fix misleading hexadecimal format

-- 
2.35.1

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

"0x%u" format is very misleading, replace by "0x%x".

Found running:

$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' block/

Inspired-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Message-id: 20220323114718.58714-2-philippe.mathieu.daude@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/parallels-ext.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/parallels-ext.c b/block/parallels-ext.c
index XXXXXXX..XXXXXXX 100644
--- a/block/parallels-ext.c
+++ b/block/parallels-ext.c
@@ -XXX,XX +XXX,XX @@ static int parallels_parse_format_extension(BlockDriverState *bs,
             break;
 
         default:
-            error_setg(errp, "Unknown feature: 0x%" PRIu64, fh.magic);
+            error_setg(errp, "Unknown feature: 0x%" PRIx64, fh.magic);
             goto fail;
         }
 
-- 
2.35.1

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

"0x%u" format is very misleading, replace by "0x%x".

Found running:

$ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' hw/

Inspired-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20220323114718.58714-3-philippe.mathieu.daude@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/i386/sgx.c        | 2 +-
 hw/i386/trace-events | 6 +++---
 hw/misc/trace-events | 4 ++--
 hw/scsi/trace-events | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/i386/sgx.c
+++ b/hw/i386/sgx.c
@@ -XXX,XX +XXX,XX @@ void pc_machine_init_sgx_epc(PCMachineState *pcms)
     }
 
     if ((sgx_epc->base + sgx_epc->size) < sgx_epc->base) {
-        error_report("Size of all 'sgx-epc' =0x%"PRIu64" causes EPC to wrap",
+        error_report("Size of all 'sgx-epc' =0x%"PRIx64" causes EPC to wrap",
                      sgx_epc->size);
         exit(EXIT_FAILURE);
     }
diff --git a/hw/i386/trace-events b/hw/i386/trace-events
index XXXXXXX..XXXXXXX 100644
--- a/hw/i386/trace-events
+++ b/hw/i386/trace-events
@@ -XXX,XX +XXX,XX @@ vtd_fault_disabled(void) "Fault processing disabled for context entry"
 vtd_replay_ce_valid(const char *mode, uint8_t bus, uint8_t dev, uint8_t fn, uint16_t domain, uint64_t hi, uint64_t lo) "%s: replay valid context device %02"PRIx8":%02"PRIx8".%02"PRIx8" domain 0x%"PRIx16" hi 0x%"PRIx64" lo 0x%"PRIx64
 vtd_replay_ce_invalid(uint8_t bus, uint8_t dev, uint8_t fn) "replay invalid context device %02"PRIx8":%02"PRIx8".%02"PRIx8
 vtd_page_walk_level(uint64_t addr, uint32_t level, uint64_t start, uint64_t end) "walk (base=0x%"PRIx64", level=%"PRIu32") iova range 0x%"PRIx64" - 0x%"PRIx64
-vtd_page_walk_one(uint16_t domain, uint64_t iova, uint64_t gpa, uint64_t mask, int perm) "domain 0x%"PRIu16" iova 0x%"PRIx64" -> gpa 0x%"PRIx64" mask 0x%"PRIx64" perm %d"
+vtd_page_walk_one(uint16_t domain, uint64_t iova, uint64_t gpa, uint64_t mask, int perm) "domain 0x%"PRIx16" iova 0x%"PRIx64" -> gpa 0x%"PRIx64" mask 0x%"PRIx64" perm %d"
 vtd_page_walk_one_skip_map(uint64_t iova, uint64_t mask, uint64_t translated) "iova 0x%"PRIx64" mask 0x%"PRIx64" translated 0x%"PRIx64
 vtd_page_walk_one_skip_unmap(uint64_t iova, uint64_t mask) "iova 0x%"PRIx64" mask 0x%"PRIx64
 vtd_page_walk_skip_read(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to unable to read"
 vtd_page_walk_skip_reserve(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to rsrv set"
 vtd_switch_address_space(uint8_t bus, uint8_t slot, uint8_t fn, bool on) "Device %02x:%02x.%x switching address space (iommu enabled=%d)"
 vtd_as_unmap_whole(uint8_t bus, uint8_t slot, uint8_t fn, uint64_t iova, uint64_t size) "Device %02x:%02x.%x start 0x%"PRIx64" size 0x%"PRIx64
-vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIu16", iova 0x%"PRIx64
-vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIu16" %d"
+vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIx16", iova 0x%"PRIx64
+vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIx16" %d"
 vtd_irq_generate(uint64_t addr, uint64_t data) "addr 0x%"PRIx64" data 0x%"PRIx64
 vtd_reg_read(uint64_t addr, uint64_t size) "addr 0x%"PRIx64" size 0x%"PRIx64
 vtd_reg_write(uint64_t addr, uint64_t size, uint64_t val) "addr 0x%"PRIx64" size 0x%"PRIx64" value 0x%"PRIx64
diff --git a/hw/misc/trace-events b/hw/misc/trace-events
index XXXXXXX..XXXXXXX 100644
--- a/hw/misc/trace-events
+++ b/hw/misc/trace-events
@@ -XXX,XX +XXX,XX @@
 # See docs/devel/tracing.rst for syntax documentation.
 
 # allwinner-cpucfg.c
-allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIu32
+allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIx32
 allwinner_cpucfg_read(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32
 allwinner_cpucfg_write(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32
 
@@ -XXX,XX +XXX,XX @@ imx7_gpr_write(uint64_t offset, uint64_t value) "addr 0x%08" PRIx64 "value 0x%08
 
 # mos6522.c
 mos6522_set_counter(int index, unsigned int val) "T%d.counter=%d"
-mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRId64 " delta_next=0x%"PRId64
+mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRIx64 " delta_next=0x%"PRIx64
 mos6522_set_sr_int(void) "set sr_int"
 mos6522_write(uint64_t addr, const char *name, uint64_t val) "reg=0x%"PRIx64 " [%s] val=0x%"PRIx64
 mos6522_read(uint64_t addr, const char *name, unsigned val) "reg=0x%"PRIx64 " [%s] val=0x%x"
diff --git a/hw/scsi/trace-events b/hw/scsi/trace-events
index XXXXXXX..XXXXXXX 100644
--- a/hw/scsi/trace-events
+++ b/hw/scsi/trace-events
@@ -XXX,XX +XXX,XX @@ lsi_bad_phase_interrupt(void) "Phase mismatch interrupt"
 lsi_bad_selection(uint32_t id) "Selected absent target %"PRIu32
 lsi_do_dma_unavailable(void) "DMA no data available"
 lsi_do_dma(uint64_t addr, int len) "DMA addr=0x%"PRIx64" len=%d"
-lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRId32
+lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRIx32
 lsi_add_msg_byte_error(void) "MSG IN data too long"
 lsi_add_msg_byte(uint8_t data) "MSG IN 0x%02x"
 lsi_reselect(int id) "Reselected target %d"
@@ -XXX,XX +XXX,XX @@ lsi_do_msgout_noop(void) "MSG: No Operation"
 lsi_do_msgout_extended(uint8_t msg, uint8_t len) "Extended message 0x%x (len %d)"
 lsi_do_msgout_ignored(const char *msg) "%s (ignored)"
 lsi_do_msgout_simplequeue(uint8_t select_tag) "SIMPLE queue tag=0x%x"
-lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRId32
+lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRIx32
 lsi_do_msgout_clearqueue(uint32_t tag) "MSG: CLEAR QUEUE tag=0x%"PRIx32
 lsi_do_msgout_busdevicereset(uint32_t tag) "MSG: BUS DEVICE RESET tag=0x%"PRIx32
 lsi_do_msgout_select(int id) "Select LUN %d"
-- 
2.35.1