tests: qemuxml2argv: Move cases from 'disk-shared-locking' into 'disk-shared'

The tests are for the same feature. Move all the cases to 'disk-shared'
case as it's already using DO_TEST_CAPS_LATEST

Signed-off-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/tests/qemuxml2argvdata/disk-shared-locking.args b/tests/qemuxml2argvdata/disk-shared-locking.args
deleted file mode 100644 (file)
index 9ced336..0000000
--- a/tests/qemuxml2argvdata/disk-shared-locking.args
+++ /dev/null
@@ -1,34 +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 1,sockets=1,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,bus=pci.0,addr=0x3 \
--usb \
--drive file=/dev/ide,format=raw,if=none,id=drive-ide0-0-0,cache=none \
--device ide-drive,bus=ide.0,unit=0,share-rw=on,drive=drive-ide0-0-0,\
-id=ide0-0-0,bootindex=1 \
--drive file=/dev/scsi,format=raw,if=none,id=drive-scsi0-0-0-0,cache=none \
--device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,share-rw=on,\
-drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \
--drive file=/dev/virtio,format=raw,if=none,id=drive-virtio-disk0,cache=none \
--device virtio-blk-pci,bus=pci.0,addr=0x4,share-rw=on,drive=drive-virtio-disk0,\
-id=virtio-disk0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5

diff --git a/tests/qemuxml2argvdata/disk-shared-locking.xml b/tests/qemuxml2argvdata/disk-shared-locking.xml
deleted file mode 100644 (file)
index dd48857..0000000
--- a/tests/qemuxml2argvdata/disk-shared-locking.xml
+++ /dev/null
@@ -1,42 +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'>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-i686</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/ide'/>
-      <target dev='hda' bus='ide'/>
-      <shareable/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/scsi'/>
-      <target dev='sda' bus='scsi'/>
-      <shareable/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/virtio'/>
-      <target dev='vda' bus='virtio'/>
-      <shareable/>
-    </disk>
-    <controller type='usb' index='0'/>
-    <controller type='ide' index='0'/>
-    <controller type='scsi' index='0' model='virtio-scsi'/>
-    <memballoon model='virtio'/>
-  </devices>
-</domain>

diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
index 96d8063abb1a6b9cb880db7f0e7c0c1f3ac78c9e..15c3b75df1bc0b56c2e748de866b746c753477dc 100644 (file)
--- a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
@@ -24,6 +24,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -no-acpi \
 -boot strict=on \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\
 cache=none \
 -device ide-hd,bus=ide.0,unit=0,share-rw=on,drive=drive-ide0-0-0,id=ide0-0-0,\
@@ -31,7 +32,13 @@ bootindex=1,write-cache=on,serial=XYZXYZXYZYXXYZYZYXYZY \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\
 readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-drive file=/dev/scsi,format=raw,if=none,id=drive-scsi0-0-0-0,cache=none \
+-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,share-rw=on,\
+drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,write-cache=on \
+-drive file=/dev/virtio,format=raw,if=none,id=drive-virtio-disk0,cache=none \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,share-rw=on,\
+drive=drive-virtio-disk0,id=virtio-disk0,write-cache=on \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
index 15f8c6b3d70b57f5e659935325ad6c491f56fc4a..4913d1ed200fa3a9f1b4d10690b1feec28f48ec2 100644 (file)
--- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
@@ -24,6 +24,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -no-acpi \
 -boot strict=on \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\
 cache=none \
 -device ide-hd,bus=ide.0,unit=0,share-rw=on,drive=drive-ide0-0-0,id=ide0-0-0,\
@@ -31,7 +32,13 @@ bootindex=1,write-cache=on,serial=XYZXYZXYZYXXYZYZYXYZY \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\
 readonly=on \
 -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-drive file=/dev/scsi,format=raw,if=none,id=drive-scsi0-0-0-0,cache=none \
+-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,share-rw=on,\
+drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,write-cache=on \
+-drive file=/dev/virtio,format=raw,if=none,id=drive-virtio-disk0,cache=none \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,share-rw=on,\
+drive=drive-virtio-disk0,id=virtio-disk0,write-cache=on \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
 resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/disk-shared.xml b/tests/qemuxml2argvdata/disk-shared.xml
index 677c2b0b7d6d089ecf89f5c3e80bb8dded501a01..ec351ee1aea142b6230fa23649b6bb1ea9d549ba 100644 (file)
--- a/tests/qemuxml2argvdata/disk-shared.xml
+++ b/tests/qemuxml2argvdata/disk-shared.xml
@@ -29,8 +29,22 @@
       <readonly/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
+    <disk type='block' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source dev='/dev/scsi'/>
+      <target dev='sda' bus='scsi'/>
+      <shareable/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <disk type='block' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source dev='/dev/virtio'/>
+      <target dev='vda' bus='virtio'/>
+      <shareable/>
+    </disk>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
+    <controller type='scsi' index='0' model='virtio-scsi'/>
     <memballoon model='virtio'/>
   </devices>
 </domain>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 046c28c4b8a4b0ea36d7956a67e093324b8523a9..b7d313d215b7ffa7822e87d9b6276dbc20e2f0c6 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1060,8 +1060,6 @@ mymain(void)
     DO_TEST_CAPS_VER("disk-shared", "2.12.0");
     DO_TEST_CAPS_LATEST("disk-shared");
     DO_TEST_PARSE_ERROR("disk-shared-qcow", NONE);
-    DO_TEST("disk-shared-locking",
-            QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DISK_SHARE_RW);
     DO_TEST("disk-error-policy", NONE);
     DO_TEST_CAPS_VER("disk-error-policy", "2.12.0");
     DO_TEST_CAPS_LATEST("disk-error-policy");