"hostdev-scsi-readonly" case tests the readonly disk with a virtio-scsi controller. Add it for the 'lsi' controller test as well. Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx> --- tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args | 2 ++ tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args | 2 ++ .../qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args | 2 ++ tests/qemuxml2argvdata/hostdev-scsi-lsi.xml | 8 ++++++++ tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 8 ++++++++ 5 files changed, 22 insertions(+) diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args index 60467c44558..1808e2a303b 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args @@ -33,5 +33,7 @@ server,nowait \ -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 \ -device scsi-generic,bus=scsi0.0,scsi-id=7,drive=drive-hostdev0,id=hostdev0 \ +-drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev1,readonly=on \ +-device scsi-generic,bus=scsi0.0,scsi-id=6,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-lsi.x86_64-4.1.0.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args index 54fbf3a8472..66764f87a1b 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args @@ -32,6 +32,8 @@ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ -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 \ -device scsi-generic,bus=scsi0.0,scsi-id=7,drive=drive-hostdev0,id=hostdev0 \ +-drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev1,readonly=on \ +-device scsi-generic,bus=scsi0.0,scsi-id=6,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-lsi.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args index 23223d4cff1..4d42bf2cbf3 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args @@ -36,6 +36,8 @@ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ -device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ -drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,scsi-id=7,drive=drive-hostdev0,id=hostdev0 \ +-drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev1,readonly=on \ +-device scsi-generic,bus=scsi0.0,scsi-id=6,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-lsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml index 34c41e3fe61..cc0960e2216 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml @@ -32,6 +32,14 @@ </source> <address type='drive' controller='0' bus='0' target='0' unit='7'/> </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='0' unit='6'/> + </hostdev> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml index 6fb6979399c..10811844255 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml @@ -39,6 +39,14 @@ </source> <address type='drive' controller='0' bus='0' target='0' unit='7'/> </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='0' unit='6'/> + </hostdev> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </memballoon> -- 2.26.2