[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/7] iscsi: reorganize code for parse_initiator_name
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 2/7] iscsi: reorganize code for parse_initiator_name |
Date: |
Thu, 9 Aug 2012 15:38:26 +0200 |
Merge the occurrences of the "iqn.2008-11.org.linux-kvm" string
to avoid duplication.
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/iscsi.c | 21 +++++++++------------
1 file modificato, 9 inserzioni(+), 12 rimozioni(-)
diff --git a/block/iscsi.c b/block/iscsi.c
index 94063ab..fd954d4 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -898,24 +898,21 @@ static char *parse_initiator_name(const char *target)
const char *name = NULL;
list = qemu_find_opts("iscsi");
- if (!list) {
- return g_strdup("iqn.2008-11.org.linux-kvm");
- }
-
- opts = qemu_opts_find(list, target);
- if (opts == NULL) {
- opts = QTAILQ_FIRST(&list->head);
+ if (list) {
+ opts = qemu_opts_find(list, target);
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) {
+ if (name) {
+ return g_strdup(name);
+ } else {
return g_strdup("iqn.2008-11.org.linux-kvm");
}
-
- return g_strdup(name);
}
/*
--
1.7.11.2
- [Qemu-devel] [PULL 0/7] last SCSI changes for 1.2, Paolo Bonzini, 2012/08/09
- [Qemu-devel] [PATCH 2/7] iscsi: reorganize code for parse_initiator_name,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 3/7] iscsi: Pick default initiator-name based on the name of the VM, Paolo Bonzini, 2012/08/09
- [Qemu-devel] [PATCH 1/7] iscsi: do not leak initiator_name, Paolo Bonzini, 2012/08/09
- [Qemu-devel] [PATCH 4/7] virtio-scsi: do not compare 32-bit QEMU tags against 64-bit virtio-scsi tags, Paolo Bonzini, 2012/08/09
- [Qemu-devel] [PATCH 6/7] scsi-disk: improve out-of-range LBA detection for WRITE SAME, Paolo Bonzini, 2012/08/09
- [Qemu-devel] [PATCH 5/7] scsi-disk: more assertions and resets for aiocb, Paolo Bonzini, 2012/08/09
- [Qemu-devel] [PATCH 7/7] scsi-disk: add support for the UNMAP command, Paolo Bonzini, 2012/08/09
- Re: [Qemu-devel] [PULL 0/7] last SCSI changes for 1.2, Anthony Liguori, 2012/08/11