SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iscsi: reorganize code for parse_initiator_name

Browse Source 
Merge the occurrences of the "iqn.2008-11.org.linux-kvm" string
to avoid duplication.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-08-06 10:54:41 +02:00
parent b93c94f7ec
commit f2ef4a6dd9
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
block/iscsi.c
View File

@ -898,24 +898,21 @@ static char *parse_initiator_name(const char *target)
const char *name = NULL; const char *name = NULL;
list = qemu_find_opts("iscsi"); list = qemu_find_opts("iscsi");
if (!list) { if (list) {
return g_strdup("iqn.2008-11.org.linux-kvm");
}
opts = qemu_opts_find(list, target); opts = qemu_opts_find(list, target);
if (opts == NULL) {
opts = QTAILQ_FIRST(&list->head);
if (!opts) { if (!opts) {
return g_strdup("iqn.2008-11.org.linux-kvm"); opts = QTAILQ_FIRST(&list->head);
} }
} if (opts) {
name = qemu_opt_get(opts, "initiator-name"); name = qemu_opt_get(opts, "initiator-name");
if (!name) { }
return g_strdup("iqn.2008-11.org.linux-kvm");
} }
if (name) {
return g_strdup(name); return g_strdup(name);
} else {
return g_strdup("iqn.2008-11.org.linux-kvm");
}
} }
/* /*