10:18 a.m.
We don't need separate files for this test. Also modernize it in the
process.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../controller-virtio-scsi.x86_64-latest.args | 6 ++-
.../controller-virtio-scsi.xml | 8 ++++
.../disk-virtio-scsi-max_sectors.args | 28 --------------
.../disk-virtio-scsi-max_sectors.xml | 31 ----------------
tests/qemuxml2argvtest.c | 2 -
.../controller-virtio-scsi.xml | 12 +++++-
.../disk-virtio-scsi-max_sectors.xml | 37 -------------------
tests/qemuxml2xmltest.c | 2 -
8 files changed, 24 insertions(+), 102 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.args
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml
diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
index 954553e6d7..3779e892b6 100644
--- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
@@ -27,6 +27,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
-device virtio-scsi-pci,id=scsi1,num_queues=8,bus=pci.0,addr=0x3 \
-device virtio-scsi-pci,id=scsi2,cmd_per_lun=50,bus=pci.0,addr=0x4 \
+-device virtio-scsi-pci,id=scsi3,max_sectors=512,bus=pci.0,addr=0x5 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0 \
-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\
id=scsi0-0-0-0,bootindex=1 \
@@ -36,7 +37,10 @@ id=scsi1-0-0-0 \
-drive file=/dev/HostVG/QEMUGuest3,format=raw,if=none,id=drive-scsi2-0-0-0 \
-device scsi-hd,bus=scsi2.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi2-0-0-0,\
id=scsi2-0-0-0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \
+-drive file=/dev/HostVG/QEMUGuest4,format=raw,if=none,id=drive-scsi3-0-0-0 \
+-device scsi-hd,bus=scsi3.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi3-0-0-0,\
+id=scsi3-0-0-0 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.xml
b/tests/qemuxml2argvdata/controller-virtio-scsi.xml
index 64d34b0fb2..ebf608d1fd 100644
--- a/tests/qemuxml2argvdata/controller-virtio-scsi.xml
+++ b/tests/qemuxml2argvdata/controller-virtio-scsi.xml
@@ -29,6 +29,11 @@
<target dev='sdc' bus='scsi'/>
<address type='drive' controller='2' bus='0'
target='0' unit='0'/>
</disk>
+ <disk type='block' device='disk'>
+ <source dev='/dev/HostVG/QEMUGuest4'/>
+ <target dev='sdd' bus='scsi'/>
+ <address type='drive' controller='3' bus='0'
target='0' unit='0'/>
+ </disk>
<controller type='usb' index='0'/>
<controller type='scsi' index='0'
model='virtio-scsi'/>
<controller type='scsi' index='1' model='virtio-scsi'>
@@ -37,6 +42,9 @@
<controller type='scsi' index='2' model='virtio-scsi'>
<driver cmd_per_lun='50'/>
</controller>
+ <controller type='scsi' index='3' model='virtio-scsi'>
+ <driver max_sectors='512'/>
+ </controller>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.args
b/tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.args
deleted file mode 100644
index 071ae542f4..0000000000
--- a/tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.args
+++ /dev/null
@@ -1,28 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
--name QEMUGuest1 \
--S \
--machine pc,accel=tcg,usb=off,dump-guest-core=off \
--m 214 \
--smp 8,sockets=8,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--device virtio-scsi-pci,id=scsi0,max_sectors=512,bus=pci.0,addr=0x3 \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0 \
--device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\
-drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.xml
b/tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.xml
deleted file mode 100644
index 838e4844b4..0000000000
--- a/tests/qemuxml2argvdata/disk-virtio-scsi-max_sectors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='qemu'>
- <name>QEMUGuest1</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>219136</memory>
- <currentMemory unit='KiB'>219136</currentMemory>
- <vcpu placement='static'>8</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-i686</emulator>
- <disk type='block' device='disk'>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='sdb' bus='scsi'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <controller type='usb' index='0'/>
- <controller type='scsi' index='0' model='virtio-scsi'>
- <driver max_sectors='512'/>
- </controller>
- <controller type='pci' index='0' model='pci-root'/>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <memballoon model='virtio'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 78e3dded8f..57e58ee6ec 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1181,8 +1181,6 @@ mymain(void)
QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_SCSI_DISK_WWN);
DO_TEST("disk-scsi-vscsi", NONE);
- DO_TEST("disk-virtio-scsi-max_sectors",
- QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("disk-virtio-scsi-ioeventfd",
QEMU_CAPS_VIRTIO_IOEVENTFD, QEMU_CAPS_VIRTIO_SCSI);
DO_TEST_CAPS_LATEST("controller-virtio-scsi");
diff --git a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
index 7db0d0c114..b108e4a0db 100644
--- a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
+++ b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
@@ -32,6 +32,12 @@
<target dev='sdc' bus='scsi'/>
<address type='drive' controller='2' bus='0'
target='0' unit='0'/>
</disk>
+ <disk type='block' device='disk'>
+ <driver name='qemu' type='raw'/>
+ <source dev='/dev/HostVG/QEMUGuest4'/>
+ <target dev='sdd' bus='scsi'/>
+ <address type='drive' controller='3' bus='0'
target='0' unit='0'/>
+ </disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
@@ -46,11 +52,15 @@
<driver cmd_per_lun='50'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x05' function='0x0'/>
</controller>
+ <controller type='scsi' index='3' model='virtio-scsi'>
+ <driver max_sectors='512'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ </controller>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x07' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml
b/tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml
deleted file mode 100644
index 07f4012fd0..0000000000
--- a/tests/qemuxml2xmloutdata/disk-virtio-scsi-max_sectors.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<domain type='qemu'>
- <name>QEMUGuest1</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>219136</memory>
- <currentMemory unit='KiB'>219136</currentMemory>
- <vcpu placement='static'>8</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-i686</emulator>
- <disk type='block' device='disk'>
- <driver name='qemu' type='raw'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='sdb' bus='scsi'/>
- <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
- </disk>
- <controller type='usb' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
- </controller>
- <controller type='scsi' index='0' model='virtio-scsi'>
- <driver max_sectors='512'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
- </controller>
- <controller type='pci' index='0' model='pci-root'/>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
- </memballoon>
- </devices>
-</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 44d9b3e7f9..8541c69190 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -369,8 +369,6 @@ mymain(void)
DO_TEST("disk-scsi-vscsi", NONE);
DO_TEST("disk-virtio-scsi-reservations",
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_PR_MANAGER_HELPER);
- DO_TEST("disk-virtio-scsi-max_sectors",
- QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("disk-virtio-scsi-ioeventfd",
QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("controller-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI);
--
2.20.1