[libvirt] [PATCH 17/17] qemuhotplugtest: Add tests for virtio SCSI disk hotplug
---
tests/qemuhotplugtest.c | 18 +++++++++
.../qemuhotplugtestdata/qemuhotplug-disk-scsi.xml | 7 ++++
.../qemuhotplug-hotplug-base+disk-scsi.xml | 46 ++++++++++++++++++++++
3 files changed, 71 insertions(+)
create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-disk-scsi.xml
create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+disk-scsi.xml
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index d47dab9..8a94345 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -78,6 +78,7 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt,
/* for attach & detach qemu must support -device */
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DRIVE);
+ virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_SCSI);
if (event)
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_DEL_EVENT);
@@ -455,6 +456,23 @@ mymain(void)
"device_del", QMP_DEVICE_DELETED("usb-disk16")
QMP_OK,
"human-monitor-command", HMP(""));
+ DO_TEST_ATTACH("hotplug-base", "disk-scsi", false, true,
+ "human-monitor-command", HMP("OK\\r\\n"),
+ "device_add", QMP_OK);
+ DO_TEST_DETACH("hotplug-base", "disk-scsi", false, false,
+ "device_del", QMP_OK,
+ "human-monitor-command", HMP(""));
+
+ DO_TEST_ATTACH_EVENT("hotplug-base", "disk-scsi", false, true,
+ "human-monitor-command", HMP("OK\\r\\n"),
+ "device_add", QMP_OK);
+ DO_TEST_DETACH("hotplug-base", "disk-scsi", true, true,
+ "device_del", QMP_OK,
+ "human-monitor-command", HMP(""));
+ DO_TEST_DETACH("hotplug-base", "disk-scsi", false, false,
+ "device_del", QMP_DEVICE_DELETED("scsi0-0-0-5")
QMP_OK,
+ "human-monitor-command", HMP(""));
+
virObjectUnref(driver.caps);
virObjectUnref(driver.xmlopt);
virObjectUnref(driver.config);
diff --git a/tests/qemuhotplugtestdata/qemuhotplug-disk-scsi.xml
b/tests/qemuhotplugtestdata/qemuhotplug-disk-scsi.xml
new file mode 100644
index 0000000..5be72b7
--- /dev/null
+++ b/tests/qemuhotplugtestdata/qemuhotplug-disk-scsi.xml
@@ -0,0 +1,7 @@
+<disk type='file' device='disk'>
+ <driver name='qemu' type='raw' cache='none'/>
+ <source file='/dev/null'/>
+ <target dev='sdf' bus='scsi'/>
+ <readonly/>
+ <shareable/>
+</disk>
diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+disk-scsi.xml
b/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+disk-scsi.xml
new file mode 100644
index 0000000..a06158b
--- /dev/null
+++ b/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+disk-scsi.xml
@@ -0,0 +1,46 @@
+<domain type='kvm'>
+ <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/libexec/qemu-kvm</emulator>
+ <disk type='file' device='disk'>
+ <driver name='qemu' type='raw' cache='none'/>
+ <source file='/dev/null'/>
+ <target dev='sdf' bus='scsi'/>
+ <readonly/>
+ <shareable/>
+ <address type='drive' controller='0' bus='0'
target='0' unit='5'/>
+ </disk>
+ <controller type='usb' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
+ </controller>
+ <controller type='ide' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
+ </controller>
+ <controller type='scsi' index='0' model='virtio-scsi'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </controller>
+ <controller type='pci' index='0' model='pci-root'/>
+ <controller type='virtio-serial' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ </controller>
+ <memballoon model='none'/>
+ </devices>
+ <seclabel type='none'/>
+</domain>
--
1.8.3.2