57 lines
2.6 KiB
Diff
57 lines
2.6 KiB
Diff
|
commit ee2c5ef39fd91345893904433c6f458685543af5
|
||
|
|
Author: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Date: Thu Apr 11 16:23:38 2019 +0200
|
||
|
|
|
||
|
|
qemuhotplugtest: Don't plug a SCSI disk at unit 7
|
||
|
|
|
||
|
|
Unit number 7 is kind of special. It's reserved for SCSI
|
||
|
|
controller. The comment in virDomainSCSIDriveAddressIsUsed()
|
||
|
|
summarizes that pretty nicely. Libvirt would never generate
|
||
|
|
such address.
|
||
|
|
|
||
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Tested-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
||
|
|
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
|
||
|
|
|
||
|
|
Index: libvirt-5.2.0/tests/qemuhotplugtest.c
|
||
|
|
===================================================================
|
||
|
|
--- libvirt-5.2.0.orig/tests/qemuhotplugtest.c
|
||
|
|
+++ libvirt-5.2.0/tests/qemuhotplugtest.c
|
||
|
|
@@ -715,7 +715,7 @@ mymain(void)
|
||
|
|
"device_del", QMP_OK,
|
||
|
|
"human-monitor-command", HMP(""));
|
||
|
|
DO_TEST_DETACH("base-with-scsi-controller-live", "disk-scsi-2", false, false,
|
||
|
|
- "device_del", QMP_DEVICE_DELETED("scsi3-0-5-7") QMP_OK,
|
||
|
|
+ "device_del", QMP_DEVICE_DELETED("scsi3-0-5-6") QMP_OK,
|
||
|
|
"human-monitor-command", HMP(""));
|
||
|
|
|
||
|
|
DO_TEST_ATTACH("base-live", "qemu-agent", false, true,
|
||
|
|
Index: libvirt-5.2.0/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml
|
||
|
|
===================================================================
|
||
|
|
--- libvirt-5.2.0.orig/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml
|
||
|
|
+++ libvirt-5.2.0/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml
|
||
|
|
@@ -2,7 +2,7 @@
|
||
|
|
<driver name='qemu' type='raw' cache='none'/>
|
||
|
|
<source file='/dev/null'/>
|
||
|
|
<target dev='sdf' bus='scsi'/>
|
||
|
|
- <address type='drive' controller='3' bus='0' target='5' unit='7'/>
|
||
|
|
+ <address type='drive' controller='3' bus='0' target='5' unit='6'/>
|
||
|
|
<readonly/>
|
||
|
|
<shareable/>
|
||
|
|
</disk>
|
||
|
|
Index: libvirt-5.2.0/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
|
||
|
|
===================================================================
|
||
|
|
--- libvirt-5.2.0.orig/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
|
||
|
|
+++ libvirt-5.2.0/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
|
||
|
|
@@ -26,8 +26,8 @@
|
||
|
|
<target dev='sdf' bus='scsi'/>
|
||
|
|
<readonly/>
|
||
|
|
<shareable/>
|
||
|
|
- <alias name='scsi3-0-5-7'/>
|
||
|
|
- <address type='drive' controller='3' bus='0' target='5' unit='7'/>
|
||
|
|
+ <alias name='scsi3-0-5-6'/>
|
||
|
|
+ <address type='drive' controller='3' bus='0' target='5' unit='6'/>
|
||
|
|
</disk>
|
||
|
|
<controller type='usb' index='0'>
|
||
|
|
<alias name='usb'/>
|