7:16 a.m.
v2 contains a test as requested.
Peter Krempa (2):
Revert "qemu: Check duplicate WWNs also for hotplugged disks"
tests: hotplug: Test disks with duplicate WWNs
src/conf/domain_conf.c | 37 -----------
tests/qemuhotplugtest.c | 5 ++
.../qemuhotplug-disk-scsi-duplicate-wwn.xml | 8 +++
...-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml | 74 ++++++++++++++++++++++
.../qemuhotplug-base-live+disk-scsi-wwn.xml | 63 ++++++++++++++++++
5 files changed, 150 insertions(+), 37 deletions(-)
create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-duplicate-wwn.xml
create mode 100644
tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml
create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn.xml
--
2.12.2
7:16 a.m.
New subject: [libvirt] [PATCH v2 1/2] Revert "qemu: Check duplicate WWNs also for hotplugged disks"
Similarly to commit 5da28cc3069b573f54f0bcaf8eb75476bcfdc6e9 this check
actually does not make sense since duplicate WWNs are used e.g. when
multipathing disks.
This reverts commit 780fe4e4baf7e2f10f65ba1a34f9274fc547cad2.
---
src/conf/domain_conf.c | 37 -------------------------------------
1 file changed, 37 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 0409c62ef..fdf85d5dd 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -25510,34 +25510,6 @@ virDomainDeviceInfoCheckBootIndex(virDomainDefPtr def
ATTRIBUTE_UNUSED,
return 0;
}
-
-/**
- * virDomainDefGetDiskByWWN:
- * @def: domain definition
- * @wwn: wwn of a disk to find
- *
- * Returns a disk definition pointer corresponding to the given WWN identifier
- * or NULL either if @wwn was NULL or if disk with given WWN is not present in
- * the domain definition.
- */
-static virDomainDiskDefPtr
-virDomainDefGetDiskByWWN(virDomainDefPtr def,
- const char *wwn)
-{
- size_t i;
-
- if (!wwn)
- return NULL;
-
- for (i = 0; i < def->ndisks; i++) {
- if (STREQ_NULLABLE(def->disks[i]->wwn, wwn))
- return def->disks[i];
- }
-
- return NULL;
-}
-
-
int
virDomainDefCompatibleDevice(virDomainDefPtr def,
virDomainDeviceDefPtr dev,
@@ -25581,15 +25553,6 @@ virDomainDefCompatibleDevice(virDomainDefPtr def,
}
}
- if (dev->type == VIR_DOMAIN_DEVICE_DISK) {
- if (!!virDomainDefGetDiskByWWN(def, dev->data.disk->wwn)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("Domain already has a disk with wwn
'%s'"),
- dev->data.disk->wwn);
- return -1;
- }
- }
-
return 0;
}
--
2.12.2
7:16 a.m.
New subject: [libvirt] [PATCH v2 2/2] tests: hotplug: Test disks with duplicate WWNs
---
tests/qemuhotplugtest.c | 5 ++
.../qemuhotplug-disk-scsi-duplicate-wwn.xml | 8 +++
...-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml | 74 ++++++++++++++++++++++
.../qemuhotplug-base-live+disk-scsi-wwn.xml | 63 ++++++++++++++++++
4 files changed, 150 insertions(+)
create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-duplicate-wwn.xml
create mode 100644
tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml
create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn.xml
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index fe97fd0dc..79f032690 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -76,6 +76,7 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt,
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_CCW);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_PLAIN);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL);
+ virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SCSI_DISK_WWN);
if (event)
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_DEL_EVENT);
@@ -809,6 +810,10 @@ mymain(void)
DO_TEST_DETACH("base-live", "ivshmem-plain-detach", false,
false,
"device_del", QMP_OK,
"object-del", QMP_OK);
+ DO_TEST_ATTACH("base-live+disk-scsi-wwn",
+ "disk-scsi-duplicate-wwn", false, true,
+ "human-monitor-command", HMP("OK\\r\\n"),
+ "device_add", QMP_OK);
#define DO_TEST_CPU_GROUP(prefix, vcpus, modernhp, expectfail) \
do { \
diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-duplicate-wwn.xml
b/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-duplicate-wwn.xml
new file mode 100644
index 000000000..5d09ad973
--- /dev/null
+++ b/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-duplicate-wwn.xml
@@ -0,0 +1,8 @@
+<disk type='file' device='disk'>
+ <driver name='qemu' type='raw' cache='none'/>
+ <source file='/dev/null'/>
+ <target dev='sdg' bus='scsi'/>
+ <readonly/>
+ <shareable/>
+ <wwn>0x5000c50015ea71aa</wwn>
+</disk>
diff --git
a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml
new file mode 100644
index 000000000..4c3ea3202
--- /dev/null
+++
b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml
@@ -0,0 +1,74 @@
+<domain type='kvm' id='7'>
+ <name>hotplug</name>
+ <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
+ <memory unit='KiB'>4194304</memory>
+ <currentMemory unit='KiB'>4194304</currentMemory>
+ <vcpu placement='static'>4</vcpu>
+ <os>
+ <type arch='x86_64' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <features>
+ <acpi/>
+ <apic/>
+ <pae/>
+ </features>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>restart</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
+ <disk type='file' device='disk'>
+ <driver name='qemu' type='raw' cache='none'/>
+ <source file='/dev/null'/>
+ <backingStore/>
+ <target dev='sdf' bus='scsi'/>
+ <readonly/>
+ <shareable/>
+ <wwn>0x5000c50015ea71aa</wwn>
+ <alias name='scsi0-0-0-5'/>
+ <address type='drive' controller='0' bus='0'
target='0' unit='5'/>
+ </disk>
+ <disk type='file' device='disk'>
+ <driver name='qemu' type='raw' cache='none'/>
+ <source file='/dev/null'/>
+ <backingStore/>
+ <target dev='sdg' bus='scsi'/>
+ <readonly/>
+ <shareable/>
+ <wwn>0x5000c50015ea71aa</wwn>
+ <alias name='scsi0-0-0-6'/>
+ <address type='drive' controller='0' bus='0'
target='0' unit='6'/>
+ </disk>
+ <controller type='usb' index='0'>
+ <alias name='usb'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
+ </controller>
+ <controller type='ide' index='0'>
+ <alias name='ide'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
+ </controller>
+ <controller type='scsi' index='0' model='virtio-scsi'>
+ <alias name='scsi0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </controller>
+ <controller type='pci' index='0' model='pci-root'>
+ <alias name='pci'/>
+ </controller>
+ <controller type='virtio-serial' index='0'>
+ <alias name='virtio-serial0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ </controller>
+ <input type='mouse' bus='ps2'>
+ <alias name='input0'/>
+ </input>
+ <input type='keyboard' bus='ps2'>
+ <alias name='input1'/>
+ </input>
+ <memballoon model='none'>
+ <alias name='balloon0'/>
+ </memballoon>
+ </devices>
+ <seclabel type='none' model='none'/>
+</domain>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn.xml
new file mode 100644
index 000000000..0de8656d2
--- /dev/null
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn.xml
@@ -0,0 +1,63 @@
+<domain type='kvm' id='7'>
+ <name>hotplug</name>
+ <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
+ <memory unit='KiB'>4194304</memory>
+ <currentMemory unit='KiB'>4194304</currentMemory>
+ <vcpu placement='static'>4</vcpu>
+ <os>
+ <type arch='x86_64' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <features>
+ <acpi/>
+ <apic/>
+ <pae/>
+ </features>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>restart</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
+ <disk type='file' device='disk'>
+ <driver name='qemu' type='raw' cache='none'/>
+ <source file='/dev/null'/>
+ <backingStore/>
+ <target dev='sdf' bus='scsi'/>
+ <readonly/>
+ <shareable/>
+ <wwn>0x5000c50015ea71aa</wwn>
+ <alias name='scsi0-0-0-5'/>
+ <address type='drive' controller='0' bus='0'
target='0' unit='5'/>
+ </disk>
+ <controller type='usb' index='0'>
+ <alias name='usb'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
+ </controller>
+ <controller type='ide' index='0'>
+ <alias name='ide'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
+ </controller>
+ <controller type='scsi' index='0' model='virtio-scsi'>
+ <alias name='scsi0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </controller>
+ <controller type='pci' index='0' model='pci-root'>
+ <alias name='pci'/>
+ </controller>
+ <controller type='virtio-serial' index='0'>
+ <alias name='virtio-serial0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ </controller>
+ <input type='mouse' bus='ps2'>
+ <alias name='input0'/>
+ </input>
+ <input type='keyboard' bus='ps2'>
+ <alias name='input1'/>
+ </input>
+ <memballoon model='none'>
+ <alias name='balloon0'/>
+ </memballoon>
+ </devices>
+ <seclabel type='none' model='none'/>
+</domain>
--
2.12.2
7:42 a.m.
On Fri, Jun 23, 2017 at 02:16:44PM +0200, Peter Krempa wrote:
v2 contains a test as requested.
Peter Krempa (2):
Revert "qemu: Check duplicate WWNs also for hotplugged disks"
tests: hotplug: Test disks with duplicate WWNs
src/conf/domain_conf.c | 37 -----------
tests/qemuhotplugtest.c | 5 ++
.../qemuhotplug-disk-scsi-duplicate-wwn.xml | 8 +++
...-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml | 74 ++++++++++++++++++++++
.../qemuhotplug-base-live+disk-scsi-wwn.xml | 63 ++++++++++++++++++
5 files changed, 150 insertions(+), 37 deletions(-)
create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-duplicate-wwn.xml
create mode 100644
tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml
create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn.xml
ACK, thank you for enhancing the test suite.
Jan
2712
days inactive
2712
days old
3 comments
2 participants
participants (2)
-
Ján Tomko -
Peter Krempa