mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iscsi: Add initiator-name option

Browse Source 
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>
This commit is contained in:
Kevin Wolf 2016-12-08 14:23:08 +01:00 committed by Jeff Cody
parent 4317142020
commit d4e799292c
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
block/iscsi.c
View File

@ -1321,26 +1321,15 @@ 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; const char *name;
char *iscsi_name; char *iscsi_name;
UuidInfo *uuid_info; UuidInfo *uuid_info;
list = qemu_find_opts("iscsi"); name = qemu_opt_get(opts, "initiator-name");
if (list) { if (name) {
opts = qemu_opts_find(list, target); return g_strdup(name);
if (!opts) {
opts = QTAILQ_FIRST(&list->head);
}
if (opts) {
name = qemu_opt_get(opts, "initiator-name");
if (name) {
return g_strdup(name);
}
}
} }
uuid_info = qmp_query_uuid(NULL); uuid_info = qmp_query_uuid(NULL);
@ -1589,7 +1578,7 @@ static void iscsi_parse_iscsi_option(const char *target, QDict *options)
{ {
QemuOptsList *list; QemuOptsList *list;
QemuOpts *opts; QemuOpts *opts;
const char *user, *password, *password_secret; const char *user, *password, *password_secret, *initiator_name;
list = qemu_find_opts("iscsi"); list = qemu_find_opts("iscsi");
if (!list) { if (!list) {
@ -1618,6 +1607,11 @@ static void iscsi_parse_iscsi_option(const char *target, QDict *options)
if (password_secret) { if (password_secret) {
qdict_set_default_str(options, "password-secret", 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);
}
} }
/* /*
@ -1706,6 +1700,10 @@ static QemuOptsList runtime_opts = {
.name = "lun", .name = "lun",
.type = QEMU_OPT_NUMBER, .type = QEMU_OPT_NUMBER,
}, },
{
.name = "initiator-name",
.type = QEMU_OPT_STRING,
},
{ /* end of list */ } { /* end of list */ }
}, },
}; };
@ -1762,7 +1760,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
memset(iscsilun, 0, sizeof(IscsiLun)); memset(iscsilun, 0, sizeof(IscsiLun));
initiator_name = parse_initiator_name(target); initiator_name = get_initiator_name(opts);
iscsi = iscsi_create_context(initiator_name); iscsi = iscsi_create_context(initiator_name);
if (iscsi == NULL) { if (iscsi == NULL) {