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

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

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>

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

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>

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

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>

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

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>

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

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>