tests: qemuargv2xmltest: Drop disk for s390 aes tests

Upcoming patches are going to make the disk portion of these
test cases fail. In order to make it work, we would need to
extend the qemuargv2xml test infrastructure to handle qemuCaps.
This is worthwhile to do at some point but isn't critical.

Instead just drop the offending portion, which isn't even the
target of the test cases anyways

diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.args b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.args
index c1609b1724d46aef4c67c025bd49913c41d4334f..ed883520ee8f63430e7e9caac4f4da28901cca0e 100644 (file)
--- a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.args
@@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \
 -nodefaults \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
--boot c \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\
-id=drive-virtio-disk0
+-boot c

diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.xml
index 7ccdc67963009e357cef13ce3deb6585c49c976c..7c100a7449e42de7c8e1ba2b96e38050621930e5 100644 (file)
--- a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.xml
@@ -14,11 +14,6 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/HostVG/QEMUGuest1'/>
-      <target dev='vda' bus='virtio'/>
-    </disk>
     <memballoon model='none'/>
     <panic model='s390'/>
   </devices>

diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.args b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.args
index 775b48422f371907863806c2837306e12cb5cdd3..99f58f0a87b8174cbc5fb82b0f6812ca0355eeb9 100644 (file)
--- a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.args
@@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \
 -nodefaults \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
--boot c \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\
-id=drive-virtio-disk0
+-boot c

diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.xml
index a02523db8c215f575f2f61b2aa416a0cba86bc64..94bb6b2559db44316e9e4dc0b9bc003445b48001 100644 (file)
--- a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.xml
@@ -14,11 +14,6 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/HostVG/QEMUGuest1'/>
-      <target dev='vda' bus='virtio'/>
-    </disk>
     <memballoon model='none'/>
     <panic model='s390'/>
   </devices>

diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.args b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.args
index e35ab0f759acb485552468285d7f630915db63df..2ffd45e351b397cea3044b0ee2ac1e7355b701d3 100644 (file)
--- a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.args
@@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \
 -nodefaults \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
--boot c \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\
-id=drive-virtio-disk0
+-boot c

diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.xml
index 7f0c871890938205a725f49f5b71ab7dfff93028..a707ce310b12375af3ea170bb0ed27ab96c15d7b 100644 (file)
--- a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.xml
@@ -14,11 +14,6 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/HostVG/QEMUGuest1'/>
-      <target dev='vda' bus='virtio'/>
-    </disk>
     <memballoon model='none'/>
     <panic model='s390'/>
   </devices>

diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.args b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.args
index 18dd415794d7fbaa66449bc2b40c0c7d032d59ff..c0102ed36fb9709ba4c4a9926f759e48cfc1287d 100644 (file)
--- a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.args
@@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \
 -nodefaults \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
--boot c \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\
-id=drive-virtio-disk0
+-boot c

diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.xml
index d4721dceaab242c340536d3dc849b05fe1af73bf..41c464a4ad24566534e450c0018b7620f5a7d38a 100644 (file)
--- a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.xml
@@ -14,11 +14,6 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/HostVG/QEMUGuest1'/>
-      <target dev='vda' bus='virtio'/>
-    </disk>
     <memballoon model='none'/>
     <panic model='s390'/>
   </devices>

diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.args b/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.args
index 283e9b31c3a67d0da7df72879bcd5bb469d2ec91..0bf57fc6d3e76eb7e720c054cf57f8d6503ee7ff 100644 (file)
--- a/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.args
@@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \
 -nodefaults \
 -monitor unix:/tmp/test-monitor,server,nowait \
 -no-acpi \
--boot c \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\
-id=drive-virtio-disk0
+-boot c

diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.xml
index 548304016b4cee37307cac42b10292dcfaf84ba7..0b0ce70be5aea635a2d0f5188e475b4aa014f5b4 100644 (file)
--- a/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.xml
@@ -14,11 +14,6 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/HostVG/QEMUGuest1'/>
-      <target dev='vda' bus='virtio'/>
-    </disk>
     <memballoon model='none'/>
     <panic model='s390'/>
   </devices>