|
 |
ae23c9 |
From cd19aec9abcc51c2d0103389c5c4a28649ccaf9f Mon Sep 17 00:00:00 2001
|
|
|
ae23c9 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
ae23c9 |
Date: Mon, 18 Jun 2018 08:43:14 +0200
|
|
|
ae23c9 |
Subject: [PATCH 016/268] iscsi: Drop deprecated -drive parameter "filename"
|
|
|
ae23c9 |
|
|
|
ae23c9 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
ae23c9 |
Message-id: <20180618084330.30009-8-armbru@redhat.com>
|
|
|
ae23c9 |
Patchwork-id: 80740
|
|
|
ae23c9 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 07/23] iscsi: Drop deprecated -drive parameter "filename"
|
|
|
ae23c9 |
Bugzilla: 1557995
|
|
|
ae23c9 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
ae23c9 |
|
|
|
ae23c9 |
Parameter "filename" is deprecated since commit 5c3ad1a6a8f, v2.10.0.
|
|
|
ae23c9 |
Time to get rid of it.
|
|
|
ae23c9 |
|
|
|
ae23c9 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
ae23c9 |
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
ae23c9 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
ae23c9 |
(cherry picked from commit deadbb8ebb5c253da9b8ed02ab51a0fadf60edc7)
|
|
|
ae23c9 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
ae23c9 |
---
|
|
|
ae23c9 |
block/iscsi.c | 23 ++---------------------
|
|
|
ae23c9 |
1 file changed, 2 insertions(+), 21 deletions(-)
|
|
|
ae23c9 |
|
|
|
ae23c9 |
diff --git a/block/iscsi.c b/block/iscsi.c
|
|
|
ae23c9 |
index d19ae0e..658462b 100644
|
|
|
ae23c9 |
--- a/block/iscsi.c
|
|
|
ae23c9 |
+++ b/block/iscsi.c
|
|
|
ae23c9 |
@@ -1732,10 +1732,6 @@ static QemuOptsList runtime_opts = {
|
|
|
ae23c9 |
.name = "timeout",
|
|
|
ae23c9 |
.type = QEMU_OPT_NUMBER,
|
|
|
ae23c9 |
},
|
|
|
ae23c9 |
- {
|
|
|
ae23c9 |
- .name = "filename",
|
|
|
ae23c9 |
- .type = QEMU_OPT_STRING,
|
|
|
ae23c9 |
- },
|
|
|
ae23c9 |
{ /* end of list */ }
|
|
|
ae23c9 |
},
|
|
|
ae23c9 |
};
|
|
|
ae23c9 |
@@ -1751,27 +1747,12 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
|
|
|
ae23c9 |
char *initiator_name = NULL;
|
|
|
ae23c9 |
QemuOpts *opts;
|
|
|
ae23c9 |
Error *local_err = NULL;
|
|
|
ae23c9 |
- const char *transport_name, *portal, *target, *filename;
|
|
|
ae23c9 |
+ const char *transport_name, *portal, *target;
|
|
|
ae23c9 |
#if LIBISCSI_API_VERSION >= (20160603)
|
|
|
ae23c9 |
enum iscsi_transport_type transport;
|
|
|
ae23c9 |
#endif
|
|
|
ae23c9 |
int i, ret = 0, timeout = 0, lun;
|
|
|
ae23c9 |
|
|
|
ae23c9 |
- /* If we are given a filename, parse the filename, with precedence given to
|
|
|
ae23c9 |
- * filename encoded options */
|
|
|
ae23c9 |
- filename = qdict_get_try_str(options, "filename");
|
|
|
ae23c9 |
- if (filename) {
|
|
|
ae23c9 |
- warn_report("'filename' option specified. "
|
|
|
ae23c9 |
- "This is an unsupported option, and may be deprecated "
|
|
|
ae23c9 |
- "in the future");
|
|
|
ae23c9 |
- iscsi_parse_filename(filename, options, &local_err);
|
|
|
ae23c9 |
- if (local_err) {
|
|
|
ae23c9 |
- ret = -EINVAL;
|
|
|
ae23c9 |
- error_propagate(errp, local_err);
|
|
|
ae23c9 |
- goto exit;
|
|
|
ae23c9 |
- }
|
|
|
ae23c9 |
- }
|
|
|
ae23c9 |
-
|
|
|
ae23c9 |
opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
|
|
|
ae23c9 |
qemu_opts_absorb_qdict(opts, options, &local_err);
|
|
|
ae23c9 |
if (local_err) {
|
|
|
ae23c9 |
@@ -1989,7 +1970,7 @@ out:
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
memset(iscsilun, 0, sizeof(IscsiLun));
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
-exit:
|
|
|
ae23c9 |
+
|
|
|
ae23c9 |
return ret;
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
|
|
|
ae23c9 |
--
|
|
|
ae23c9 |
1.8.3.1
|
|
|
ae23c9 |
|