|
 |
99cbc7 |
From 39913e84c19c6e0b94c1084c31db89d3c71998b9 Mon Sep 17 00:00:00 2001
|
|
|
99cbc7 |
Message-Id: <39913e84c19c6e0b94c1084c31db89d3c71998b9@dist-git>
|
|
|
99cbc7 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
99cbc7 |
Date: Thu, 18 Apr 2019 18:43:11 +0200
|
|
|
99cbc7 |
Subject: [PATCH] qemuhotplugtest: Don't plug a SCSI disk at unit 7
|
|
|
99cbc7 |
|
|
|
99cbc7 |
https://bugzilla.redhat.com/show_bug.cgi?id=1692296
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Unit number 7 is kind of special. It's reserved for SCSI
|
|
|
99cbc7 |
controller. The comment in virDomainSCSIDriveAddressIsUsed()
|
|
|
99cbc7 |
summarizes that pretty nicely. Libvirt would never generate
|
|
|
99cbc7 |
such address.
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
99cbc7 |
Tested-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
|
|
99cbc7 |
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
|
|
|
99cbc7 |
(cherry picked from commit ee2c5ef39fd91345893904433c6f458685543af5)
|
|
|
99cbc7 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Conflicts:
|
|
|
99cbc7 |
tests/qemuhotplugtest.c - Context because of 8bac3f7591f
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
99cbc7 |
Message-Id: <0fd182e53c8493b4d7ac2aa8d9bdae5baad52948.1555605741.git.mprivozn@redhat.com>
|
|
|
99cbc7 |
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
99cbc7 |
---
|
|
|
99cbc7 |
tests/qemuhotplugtest.c | 2 +-
|
|
|
99cbc7 |
tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml | 2 +-
|
|
|
99cbc7 |
...uhotplug-base-without-scsi-controller-live+disk-scsi-2.xml | 4 ++--
|
|
|
99cbc7 |
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
|
|
|
99cbc7 |
index f27fdbbb09..bc199685c6 100644
|
|
|
99cbc7 |
--- a/tests/qemuhotplugtest.c
|
|
|
99cbc7 |
+++ b/tests/qemuhotplugtest.c
|
|
|
99cbc7 |
@@ -833,7 +833,7 @@ mymain(void)
|
|
|
99cbc7 |
"__com.redhat_drive_del", QMP_NOT_FOUND,
|
|
|
99cbc7 |
"human-monitor-command", HMP(""));
|
|
|
99cbc7 |
DO_TEST_DETACH("base-with-scsi-controller-live", "disk-scsi-2", false, false,
|
|
|
99cbc7 |
- "device_del", QMP_DEVICE_DELETED("scsi3-0-5-7") QMP_OK,
|
|
|
99cbc7 |
+ "device_del", QMP_DEVICE_DELETED("scsi3-0-5-6") QMP_OK,
|
|
|
99cbc7 |
"__com.redhat_drive_del", QMP_NOT_FOUND,
|
|
|
99cbc7 |
"human-monitor-command", HMP(""));
|
|
|
99cbc7 |
|
|
|
99cbc7 |
diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml b/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml
|
|
|
99cbc7 |
index 3a847fbda6..876afb182f 100644
|
|
|
99cbc7 |
--- a/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml
|
|
|
99cbc7 |
+++ b/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml
|
|
|
99cbc7 |
@@ -2,7 +2,7 @@
|
|
|
99cbc7 |
<driver name='qemu' type='raw' cache='none'/>
|
|
|
99cbc7 |
<source file='/dev/null'/>
|
|
|
99cbc7 |
<target dev='sdf' bus='scsi'/>
|
|
|
99cbc7 |
- <address type='drive' controller='3' bus='0' target='5' unit='7'/>
|
|
|
99cbc7 |
+ <address type='drive' controller='3' bus='0' target='5' unit='6'/>
|
|
|
99cbc7 |
<readonly/>
|
|
|
99cbc7 |
<shareable/>
|
|
|
99cbc7 |
</disk>
|
|
|
99cbc7 |
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
|
|
|
99cbc7 |
index d35fea6f5f..72b5174825 100644
|
|
|
99cbc7 |
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
|
|
|
99cbc7 |
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
|
|
|
99cbc7 |
@@ -26,8 +26,8 @@
|
|
|
99cbc7 |
<target dev='sdf' bus='scsi'/>
|
|
|
99cbc7 |
<readonly/>
|
|
|
99cbc7 |
<shareable/>
|
|
|
99cbc7 |
- <alias name='scsi3-0-5-7'/>
|
|
|
99cbc7 |
- <address type='drive' controller='3' bus='0' target='5' unit='7'/>
|
|
|
99cbc7 |
+ <alias name='scsi3-0-5-6'/>
|
|
|
99cbc7 |
+ <address type='drive' controller='3' bus='0' target='5' unit='6'/>
|
|
|
99cbc7 |
</disk>
|
|
|
99cbc7 |
<controller type='usb' index='0'>
|
|
|
99cbc7 |
<alias name='usb'/>
|
|
|
99cbc7 |
--
|
|
|
99cbc7 |
2.21.0
|
|
|
99cbc7 |
|