Series comparison

-[Qemu-devel] [PULL 0/9] Block patches
+[PULL for-6.1 0/3] Block patches
-The following changes since commit a1cf5fac2b929ffa2abd1285401f2535ff8c6fea:
+The following changes since commit 3521ade3510eb5cefb2e27a101667f25dad89935:
-  Merge remote-tracking branch 'remotes/armbru/tags/pull-block-2017-02-21' into staging (2017-02-21 13:58:50 +0000)
+  Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-07-29' into staging (2021-07-29 13:17:20 +0100)
-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 cc8eecd7f105a1dff5876adeb238a14696061a4a:
-  qemu-options: Fix broken sheepdog URL (2017-02-21 10:38:09 -0500)
+  MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver (2021-07-29 17:17:34 +0100)
 ----------------------------------------------------------------
-Block patches
+Pull request
 The main fix here is for io_uring. Spurious -EAGAIN errors can happen and the
 request needs to be resubmitted.
 The MAINTAINERS changes carry no risk and we might as well include them in QEMU
 .1.
 ----------------------------------------------------------------
-Anton Nefedov (1):
+Fabian Ebner (1):
-  mirror: do not increase offset during initial zero_or_discard phase
+  block/io_uring: resubmit when result is -EAGAIN
-Jeff Cody (1):
+Philippe Mathieu-Daudé (1):
-  QAPI: Fix blockdev-add example documentation
+  MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver
-Kevin Wolf (6):
+Stefano Garzarella (1):
-  iscsi: Split URL into individual options
+  MAINTAINERS: add Stefano Garzarella as io_uring reviewer
   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):
+ MAINTAINERS      |  2 ++
-  qemu-options: Fix broken sheepdog URL
+ block/io_uring.c | 16 +++++++++++++++-
+files changed, 17 insertions(+), 1 deletion(-)
  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
+.31.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 6/9] iscsi: Add blockdev-add support
+Deleted patch
-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 ++++++++++++++++++++++++++++++++++++++++++++++++----
-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',
---
-.9.3

-[Qemu-devel] [PULL 9/9] qemu-options: Fix broken sheepdog URL
+[PULL for-6.1 1/3] MAINTAINERS: add Stefano Garzarella as io_uring reviewer
-From: Thomas Huth <thuth@redhat.com>
+From: Stefano Garzarella <sgarzare@redhat.com>
-The sheepdog URL is broken twice: First it uses a duplicated
+I've been working with io_uring for a while so I'd like to help
-http:// prefix, second the website seems to have moved to
+with reviews.
 https://sheepdog.github.io/sheepdog/ instead.
-Signed-off-by: Thomas Huth <thuth@redhat.com>
+Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+Message-Id: <20210728131515.131045-1-sgarzare@redhat.com>
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- qemu-options.hx | 2 +-
+ MAINTAINERS | 1 +
-file changed, 1 insertion(+), 1 deletion(-)
+file changed, 1 insertion(+)
-diff --git a/qemu-options.hx b/qemu-options.hx
+diff --git a/MAINTAINERS b/MAINTAINERS
 index XXXXXXX..XXXXXXX 100644
---- a/qemu-options.hx
+--- a/MAINTAINERS
-+++ b/qemu-options.hx
++++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@ Example
+@@ -XXX,XX +XXX,XX @@ Linux io_uring
- qemu-system-i386 --drive file=sheepdog://192.0.2.1:30000/MyVirtualMachine
+ M: Aarushi Mehta <mehta.aaru20@gmail.com>
- @end example
+ M: Julia Suvorova <jusual@redhat.com>
+ M: Stefan Hajnoczi <stefanha@redhat.com>
--See also @url{http://http://www.osrg.net/sheepdog/}.
++R: Stefano Garzarella <sgarzare@redhat.com>
-+See also @url{https://sheepdog.github.io/sheepdog/}.
+ L: qemu-block@nongnu.org
+ S: Maintained
- @item GlusterFS
+ F: block/io_uring.c
  GlusterFS is a user space distributed file system.
 --
-.9.3
+.31.1

-[Qemu-devel] [PULL 8/9] mirror: do not increase offset during initial zero_or_discard phase
+[PULL for-6.1 2/3] block/io_uring: resubmit when result is -EAGAIN
-From: Anton Nefedov <anton.nefedov@virtuozzo.com>
+From: Fabian Ebner <f.ebner@proxmox.com>
-If explicit zeroing out before mirroring is required for the target image,
+Linux SCSI can throw spurious -EAGAIN in some corner cases in its
-it moves the block job offset counter to EOF, then offset and len counters
+completion path, which will end up being the result in the completed
-count the image size twice. There is no harm but stats are confusing,
+io_uring request.
 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
+Resubmitting such requests should allow block jobs to complete, even
-image. This should not cause any further harm.
+if such spurious errors are encountered.
-Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
+Co-authored-by: Stefan Hajnoczi <stefanha@gmail.com>
-Signed-off-by: Denis V. Lunev <den@openvz.org>
+Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
+Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Message-id: 20210729091029.65369-1-f.ebner@proxmox.com
-Message-id: 1486045515-8009-1-git-send-email-den@openvz.org
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 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 +++++++--
+ block/io_uring.c | 16 +++++++++++++++-
-file changed, 7 insertions(+), 2 deletions(-)
+file changed, 15 insertions(+), 1 deletion(-)
-diff --git a/block/mirror.c b/block/mirror.c
+diff --git a/block/io_uring.c b/block/io_uring.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/mirror.c
+--- a/block/io_uring.c
-+++ b/block/mirror.c
++++ b/block/io_uring.c
-@@ -XXX,XX +XXX,XX @@ typedef struct MirrorBlockJob {
+@@ -XXX,XX +XXX,XX @@ static void luring_process_completions(LuringState *s)
-     bool waiting_for_io;
+         total_bytes = ret + luringcb->total_read;
-     int target_cluster_sectors;
-     int max_iov;
+         if (ret < 0) {
-+    bool initial_zeroing_ongoing;
+-            if (ret == -EINTR) {
- } MirrorBlockJob;
++            /*
++             * Only writev/readv/fsync requests on regular files or host block
- typedef struct MirrorOp {
++             * devices are submitted. Therefore -EAGAIN is not expected but it's
-@@ -XXX,XX +XXX,XX @@ static void mirror_iteration_done(MirrorOp *op, int ret)
++             * known to happen sometimes with Linux SCSI. Submit again and hope
-         if (s->cow_bitmap) {
++             * the request completes successfully.
-             bitmap_set(s->cow_bitmap, chunk_num, nb_chunks);
++             *
-         }
++             * For more information, see:
--        s->common.offset += (uint64_t)op->nb_sectors * BDRV_SECTOR_SIZE;
++             * https://lore.kernel.org/io-uring/20210727165811.284510-3-axboe@kernel.dk/T/#u
-+        if (!s->initial_zeroing_ongoing) {
++             *
-+            s->common.offset += (uint64_t)op->nb_sectors * BDRV_SECTOR_SIZE;
++             * If the code is changed to submit other types of requests in the
-+        }
++             * future, then this workaround may need to be extended to deal with
-     }
++             * genuine -EAGAIN results that should not be resubmitted
--
++             * immediately.
-     qemu_iovec_destroy(&op->qiov);
++             */
-     g_free(op);
++            if (ret == -EINTR || ret == -EAGAIN) {
+                 luring_resubmit(s, luringcb);
-@@ -XXX,XX +XXX,XX @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)
+                 continue;
              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
+.31.1

-[Qemu-devel] [PULL 7/9] QAPI: Fix blockdev-add example documentation
+[PULL for-6.1 3/3] MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+From: Philippe Mathieu-Daudé <philmd@redhat.com>
 I'm interested in following the activity around the NVMe bdrv.
 Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
 Message-id: 20210728183340.2018313-1-philmd@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- qapi/block-core.json | 50 +++++++++++++++++++++++++-------------------------
+ MAINTAINERS | 1 +
-file changed, 25 insertions(+), 25 deletions(-)
+file changed, 1 insertion(+)
-diff --git a/qapi/block-core.json b/qapi/block-core.json
+diff --git a/MAINTAINERS b/MAINTAINERS
 index XXXXXXX..XXXXXXX 100644
---- a/qapi/block-core.json
+--- a/MAINTAINERS
-+++ b/qapi/block-core.json
++++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ F: block/null.c
- # 1.
+ NVMe Block Driver
- # -> { "execute": "blockdev-add",
+ M: Stefan Hajnoczi <stefanha@redhat.com>
- #      "arguments": {
+ R: Fam Zheng <fam@euphon.net>
--#          "options" : { "driver": "qcow2",
++R: Philippe Mathieu-Daudé <philmd@redhat.com>
--#                        "file": { "driver": "file",
+ L: qemu-block@nongnu.org
--#                                  "filename": "test.qcow2" } } } }
+ S: Supported
-+#           "driver": "qcow2",
+ F: block/nvme*
 +#           "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
+.31.1

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 3521ade3510eb5cefb2e27a101667f25dad89935:

Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-07-29' into staging (2021-07-29 13:17:20 +0100)

are available in the Git repository at:

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

for you to fetch changes up to cc8eecd7f105a1dff5876adeb238a14696061a4a:

MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver (2021-07-29 17:17:34 +0100)

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

The main fix here is for io_uring. Spurious -EAGAIN errors can happen and the
request needs to be resubmitted.

The MAINTAINERS changes carry no risk and we might as well include them in QEMU
6.1.

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

Fabian Ebner (1):
  block/io_uring: resubmit when result is -EAGAIN

Philippe Mathieu-Daudé (1):
  MAINTAINERS: Added myself as a reviewer for the NVMe Block Driver

Stefano Garzarella (1):
  MAINTAINERS: add Stefano Garzarella as io_uring reviewer

MAINTAINERS      |  2 ++
 block/io_uring.c | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

-- 
2.31.1

From: Fabian Ebner <f.ebner@proxmox.com>

Linux SCSI can throw spurious -EAGAIN in some corner cases in its
completion path, which will end up being the result in the completed
io_uring request.

Resubmitting such requests should allow block jobs to complete, even
if such spurious errors are encountered.

Co-authored-by: Stefan Hajnoczi <stefanha@gmail.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
Message-id: 20210729091029.65369-1-f.ebner@proxmox.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/io_uring.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/block/io_uring.c b/block/io_uring.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io_uring.c
+++ b/block/io_uring.c
@@ -XXX,XX +XXX,XX @@ static void luring_process_completions(LuringState *s)
         total_bytes = ret + luringcb->total_read;
 
         if (ret < 0) {
-            if (ret == -EINTR) {
+            /*
+             * Only writev/readv/fsync requests on regular files or host block
+             * devices are submitted. Therefore -EAGAIN is not expected but it's
+             * known to happen sometimes with Linux SCSI. Submit again and hope
+             * the request completes successfully.
+             *
+             * For more information, see:
+             * https://lore.kernel.org/io-uring/20210727165811.284510-3-axboe@kernel.dk/T/#u
+             *
+             * If the code is changed to submit other types of requests in the
+             * future, then this workaround may need to be extended to deal with
+             * genuine -EAGAIN results that should not be resubmitted
+             * immediately.
+             */
+            if (ret == -EINTR || ret == -EAGAIN) {
                 luring_resubmit(s, luringcb);
                 continue;
             }
-- 
2.31.1