On Wed, 01/25 12:42, Jeff Cody wrote:
> From: Kevin Wolf <kw...@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 <berra...@redhat.com>
> Signed-off-by: Kevin Wolf <kw...@redhat.com>
> Signed-off-by: Jeff Cody <jc...@redhat.com>
> ---
> block/iscsi.c | 37 +++++++++++--------------------------
> 1 file changed, 11 insertions(+), 26 deletions(-)
>
> diff --git a/block/iscsi.c b/block/iscsi.c
> index a989b52..4701a27 100644
> --- a/block/iscsi.c
> +++ b/block/iscsi.c
> @@ -1318,29 +1318,6 @@ 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;
> @@ -1549,7 +1526,7 @@ 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) {
> @@ -1588,6 +1565,11 @@ 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);
> + }
> }
>
> /*
> @@ -1639,7 +1621,6 @@ 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),
> @@ -1680,6 +1661,10 @@ static QemuOptsList runtime_opts = {
> .name = "header-digest",
> .type = QEMU_OPT_STRING,
> },
> + {
> + .name = "timeout",
> + .type = QEMU_OPT_NUMBER,
> + },
> { /* end of list */ }
> },
> };
> @@ -1780,7 +1765,7 @@ 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
>
>
Reviewed-by: Fam Zheng <f...@redhat.com>
