qemuxmlconftest: Test various combinations of config

Add multiple USB disks to the definition testing a matrix of 'disk' and
'cdrom' <disk> elements with user-aliases, 'serial' and 'removable'
properties configured.

This patch also removes the 'ide' disk which is not related to what
we're testing here.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.args b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.args
index 0fd7e755b1384227b63d6a080bd6af947596ae06..079dfe5d99da6d36854e28502389194d8dd4a107 100644 (file)
--- a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.args
@@ -27,10 +27,32 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-shutdown \
 -boot strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
--blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","read-only":false}' \
--device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-storage","id":"ide0-0-0","bootindex":1}' \
--blockdev '{"driver":"file","filename":"/tmp/usbdisk.img","node-name":"libvirt-1-storage","read-only":false}' \
--device '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt-1-storage","id":"usb-disk0","removable":false}' \
+-device '{"driver":"usb-hub","id":"hub0","bus":"usb.0","port":"1"}' \
+-device '{"driver":"usb-hub","id":"hub1","bus":"usb.0","port":"2"}' \
+-blockdev '{"driver":"file","filename":"/tmp/img1","node-name":"libvirt-12-storage","read-only":false}' \
+-device '{"driver":"usb-storage","bus":"usb.0","port":"1.1","drive":"libvirt-12-storage","id":"usb-disk0","bootindex":1,"removable":false}' \
+-blockdev '{"driver":"file","filename":"/tmp/img2","node-name":"libvirt-11-storage","read-only":true}' \
+-device '{"driver":"usb-storage","bus":"usb.0","port":"1.2","drive":"libvirt-11-storage","id":"usb-disk1","removable":false}' \
+-blockdev '{"driver":"file","filename":"/tmp/img3","node-name":"libvirt-10-storage","read-only":false}' \
+-device '{"driver":"usb-storage","bus":"usb.0","port":"1.3","drive":"libvirt-10-storage","id":"usb-disk2","removable":false,"serial":"testserial1"}' \
+-blockdev '{"driver":"file","filename":"/tmp/img4","node-name":"libvirt-9-storage","read-only":true}' \
+-device '{"driver":"usb-storage","bus":"usb.0","port":"1.4","drive":"libvirt-9-storage","id":"usb-disk3","removable":false,"serial":"testserial2"}' \
+-blockdev '{"driver":"file","filename":"/tmp/img5","node-name":"libvirt-8-storage","read-only":false}' \
+-device '{"driver":"usb-storage","bus":"usb.0","port":"1.5","drive":"libvirt-8-storage","id":"ua-test1","removable":false}' \
+-blockdev '{"driver":"file","filename":"/tmp/img6","node-name":"libvirt-7-storage","read-only":true}' \
+-device '{"driver":"usb-storage","bus":"usb.0","port":"1.6","drive":"libvirt-7-storage","id":"ua-test2","removable":false}' \
+-blockdev '{"driver":"file","filename":"/tmp/img7","node-name":"libvirt-6-storage","read-only":false}' \
+-device '{"driver":"usb-storage","bus":"usb.0","port":"1.7","drive":"libvirt-6-storage","id":"ua-test3","removable":false,"serial":"testserial3"}' \
+-blockdev '{"driver":"file","filename":"/tmp/img8","node-name":"libvirt-5-storage","read-only":true}' \
+-device '{"driver":"usb-storage","bus":"usb.0","port":"1.8","drive":"libvirt-5-storage","id":"ua-test4","removable":false,"serial":"testserial4"}' \
+-blockdev '{"driver":"file","filename":"/tmp/img9","node-name":"libvirt-4-storage","read-only":false}' \
+-device '{"driver":"usb-storage","bus":"usb.0","port":"2.1","drive":"libvirt-4-storage","id":"usb-disk8","removable":true}' \
+-blockdev '{"driver":"file","filename":"/tmp/imga","node-name":"libvirt-3-storage","read-only":false}' \
+-device '{"driver":"usb-storage","bus":"usb.0","port":"2.2","drive":"libvirt-3-storage","id":"usb-disk9","removable":true,"serial":"testserial5"}' \
+-blockdev '{"driver":"file","filename":"/tmp/imgb","node-name":"libvirt-2-storage","read-only":false}' \
+-device '{"driver":"usb-storage","bus":"usb.0","port":"2.3","drive":"libvirt-2-storage","id":"ua-test5","removable":true}' \
+-blockdev '{"driver":"file","filename":"/tmp/imgc","node-name":"libvirt-1-storage","read-only":false}' \
+-device '{"driver":"usb-storage","bus":"usb.0","port":"2.4","drive":"libvirt-1-storage","id":"ua-test6","removable":true,"serial":"testserial6"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \

diff --git a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.xml
index e42dc23178c6f8fc19fecd6ef7c615facb0ca5ac..8b78f77e63efe5b9a9b5904a3463c35f6e48d78a 100644 (file)
--- a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.xml
@@ -17,24 +17,86 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source file='/tmp/img1'/>
+      <target dev='sda' bus='usb'/>
+    </disk>
+    <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>
-      <source dev='/dev/HostVG/QEMUGuest1'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+      <source file='/tmp/img2'/>
+      <target dev='sdb' bus='usb'/>
+      <readonly/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw'/>
-      <source file='/tmp/usbdisk.img'/>
-      <target dev='sda' bus='usb'/>
+      <source file='/tmp/img3'/>
+      <target dev='sdc' bus='usb'/>
+      <serial>testserial1</serial>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source file='/tmp/img4'/>
+      <target dev='sdd' bus='usb'/>
+      <readonly/>
+      <serial>testserial2</serial>
+    </disk>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source file='/tmp/img5'/>
+      <target dev='sde' bus='usb'/>
+      <alias name='ua-test1'/>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source file='/tmp/img6'/>
+      <target dev='sdf' bus='usb'/>
+      <readonly/>
+      <alias name='ua-test2'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source file='/tmp/img7'/>
+      <target dev='sdg' bus='usb'/>
+      <serial>testserial3</serial>
+      <alias name='ua-test3'/>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source file='/tmp/img8'/>
+      <target dev='sdh' bus='usb'/>
+      <readonly/>
+      <serial>testserial4</serial>
+      <alias name='ua-test4'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source file='/tmp/img9'/>
+      <target dev='sdi' bus='usb' removable='on'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source file='/tmp/imga'/>
+      <target dev='sdj' bus='usb' removable='on'/>
+      <serial>testserial5</serial>
+    </disk>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source file='/tmp/imgb'/>
+      <target dev='sdk' bus='usb' removable='on'/>
+      <alias name='ua-test5'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source file='/tmp/imgc'/>
+      <target dev='sdl' bus='usb' removable='on'/>
+      <serial>testserial6</serial>
+      <alias name='ua-test6'/>
     </disk>
     <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
-    <controller type='ide' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
-    </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>

diff --git a/tests/qemuxmlconfdata/disk-usb-device.xml b/tests/qemuxmlconfdata/disk-usb-device.xml
index 92dcc659ac5a4bc054300cdca96604c91a94539c..0478875177a65bb1706753e9866e43846ac8d6e5 100644 (file)
--- a/tests/qemuxmlconfdata/disk-usb-device.xml
+++ b/tests/qemuxmlconfdata/disk-usb-device.xml
@@ -14,14 +14,70 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <source dev='/dev/HostVG/QEMUGuest1'/>
-      <target dev='hda' bus='ide'/>
-    </disk>
     <disk type='file' device='disk'>
-      <source file='/tmp/usbdisk.img'/>
+      <source file='/tmp/img1'/>
       <target dev='sda' bus='usb'/>
     </disk>
+    <disk type='file' device='cdrom'>
+      <source file='/tmp/img2'/>
+      <target dev='sdb' bus='usb'/>
+      <readonly/>
+    </disk>
+    <disk type='file' device='disk'>
+      <source file='/tmp/img3'/>
+      <target dev='sdc' bus='usb'/>
+      <serial>testserial1</serial>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <source file='/tmp/img4'/>
+      <target dev='sdd' bus='usb'/>
+      <readonly/>
+      <serial>testserial2</serial>
+    </disk>
+    <disk type='file' device='disk'>
+      <source file='/tmp/img5'/>
+      <target dev='sde' bus='usb'/>
+      <alias name='ua-test1'/>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <source file='/tmp/img6'/>
+      <target dev='sdf' bus='usb'/>
+      <readonly/>
+      <alias name='ua-test2'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <source file='/tmp/img7'/>
+      <target dev='sdg' bus='usb'/>
+      <serial>testserial3</serial>
+      <alias name='ua-test3'/>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <source file='/tmp/img8'/>
+      <target dev='sdh' bus='usb'/>
+      <readonly/>
+      <serial>testserial4</serial>
+      <alias name='ua-test4'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <source file='/tmp/img9'/>
+      <target dev='sdi' bus='usb' removable='on'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <source file='/tmp/imga'/>
+      <target dev='sdj' bus='usb' removable='on'/>
+      <serial>testserial5</serial>
+    </disk>
+    <disk type='file' device='disk'>
+      <source file='/tmp/imgb'/>
+      <target dev='sdk' bus='usb' removable='on'/>
+      <alias name='ua-test5'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <source file='/tmp/imgc'/>
+      <target dev='sdl' bus='usb' removable='on'/>
+      <serial>testserial6</serial>
+      <alias name='ua-test6'/>
+    </disk>
     <memballoon model='virtio'/>
   </devices>
 </domain>