This can be tested along with other stuff.
Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
.../hostdev-scsi-readonly.args | 34 --------------
.../hostdev-scsi-readonly.xml | 38 ---------------
...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 3 ++
...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 3 ++
...ostdev-scsi-virtio-scsi.x86_64-latest.args | 3 ++
.../hostdev-scsi-virtio-scsi.xml | 8 ++++
tests/qemuxml2argvtest.c | 3 --
.../hostdev-scsi-readonly.xml | 47 -------------------
.../hostdev-scsi-virtio-scsi.xml | 8 ++++
tests/qemuxml2xmltest.c | 3 --
10 files changed, 25 insertions(+), 125 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-readonly.args
delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-readonly.xml
delete mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args b/tests/qemuxml2argvdata/hostdev-scsi-readonly.args
deleted file mode 100644
index 0e481e74647..00000000000
--- a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest2 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--name QEMUGuest2 \
--S \
--machine pc,accel=tcg,usb=off,dump-guest-core=off \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\
-server,nowait \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
--usb \
--drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev0,readonly=on \
--device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,\
-drive=drive-hostdev0,id=hostdev0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml b/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml
deleted file mode 100644
index 2e70edd6400..00000000000
--- a/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<domain type='qemu'>
- <name>QEMUGuest2</name>
- <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid>
- <memory unit='KiB'>219100</memory>
- <currentMemory unit='KiB'>219100</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='i686' machine='pc'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
- <disk type='block' device='disk'>
- <source dev='/dev/HostVG/QEMUGuest2'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
- </disk>
- <controller type='scsi' index='0' model='virtio-scsi'/>
- <controller type='usb' index='0'/>
- <controller type='ide' index='0'/>
- <controller type='pci' index='0' model='pci-root'/>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
- <source>
- <adapter name='scsi_host0'/>
- <address bus='0' target='0' unit='0'/>
- </source>
- <readonly/>
- <address type='drive' controller='0' bus='0' target='4' unit='8'/>
- </hostdev>
- <memballoon model='virtio'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
index 810d02a408a..50353df478c 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
@@ -34,5 +34,8 @@ server,nowait \
-drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev0 \
-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,\
drive=drive-hostdev0,id=hostdev0 \
+-drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev1,readonly=on \
+-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=7,\
+drive=drive-hostdev1,id=hostdev1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
index e74fd1118ca..e0680fce4cf 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
@@ -33,6 +33,9 @@ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
-drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev0 \
-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,\
drive=drive-hostdev0,id=hostdev0 \
+-drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev1,readonly=on \
+-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=7,\
+drive=drive-hostdev1,id=hostdev1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args
index 9a70b6eeb0f..0da84d08b30 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args
@@ -37,6 +37,9 @@ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
-drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev0 \
-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,\
drive=drive-hostdev0,id=hostdev0 \
+-drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev1,readonly=on \
+-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=7,\
+drive=drive-hostdev1,id=hostdev1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml
index 0fe01de1abd..013c8cd17f7 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml
@@ -32,6 +32,14 @@
</source>
<address type='drive' controller='0' bus='0' target='4' unit='8'/>
</hostdev>
+ <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <source>
+ <adapter name='scsi_host0'/>
+ <address bus='0' target='0' unit='1'/>
+ </source>
+ <readonly/>
+ <address type='drive' controller='0' bus='0' target='4' unit='7'/>
+ </hostdev>
<memballoon model='virtio'/>
</devices>
</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index d9544a511b7..e10d90fbf88 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2663,9 +2663,6 @@ mymain(void)
DO_TEST_CAPS_VER("hostdev-scsi-virtio-scsi", "4.1.0");
DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi");
- DO_TEST("hostdev-scsi-readonly",
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-virtio-iscsi",
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_SCSI_LSI);
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml
deleted file mode 100644
index 17bb7e3904d..00000000000
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<domain type='qemu'>
- <name>QEMUGuest2</name>
- <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid>
- <memory unit='KiB'>219100</memory>
- <currentMemory unit='KiB'>219100</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='i686' machine='pc'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
- <disk type='block' device='disk'>
- <driver name='qemu' type='raw'/>
- <source dev='/dev/HostVG/QEMUGuest2'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
- </disk>
- <controller type='scsi' index='0' model='virtio-scsi'>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
- </controller>
- <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='pci' index='0' model='pci-root'/>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <hostdev mode='subsystem' type='scsi' managed='yes'>
- <source>
- <adapter name='scsi_host0'/>
- <address bus='0' target='0' unit='0'/>
- </source>
- <readonly/>
- <address type='drive' controller='0' bus='0' target='4' unit='8'/>
- </hostdev>
- <memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
- </memballoon>
- </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
index 81ae94318b5..a1fa36de386 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
@@ -39,6 +39,14 @@
</source>
<address type='drive' controller='0' bus='0' target='4' unit='8'/>
</hostdev>
+ <hostdev mode='subsystem' type='scsi' managed='yes'>
+ <source>
+ <adapter name='scsi_host0'/>
+ <address bus='0' target='0' unit='1'/>
+ </source>
+ <readonly/>
+ <address type='drive' controller='0' bus='0' target='4' unit='7'/>
+ </hostdev>
<memballoon model='virtio'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
</memballoon>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 2857f4f30f9..d3da788979d 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1021,9 +1021,6 @@ mymain(void)
DO_TEST("hostdev-scsi-virtio-scsi",
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_SCSI_LSI);
- DO_TEST("hostdev-scsi-readonly",
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-shareable",
QEMU_CAPS_VIRTIO_SCSI,
--
2.26.2
