提交 19cab36a 编写于 作者: C Cole Robinson

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
上级 383833e2
...@@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \ ...@@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \
-nodefaults \ -nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \ -monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \ -no-acpi \
-boot c \ -boot c
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\
id=drive-virtio-disk0
...@@ -14,11 +14,6 @@ ...@@ -14,11 +14,6 @@
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-s390x</emulator> <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'/> <memballoon model='none'/>
<panic model='s390'/> <panic model='s390'/>
</devices> </devices>
......
...@@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \ ...@@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \
-nodefaults \ -nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \ -monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \ -no-acpi \
-boot c \ -boot c
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\
id=drive-virtio-disk0
...@@ -14,11 +14,6 @@ ...@@ -14,11 +14,6 @@
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-s390x</emulator> <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'/> <memballoon model='none'/>
<panic model='s390'/> <panic model='s390'/>
</devices> </devices>
......
...@@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \ ...@@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \
-nodefaults \ -nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \ -monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \ -no-acpi \
-boot c \ -boot c
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\
id=drive-virtio-disk0
...@@ -14,11 +14,6 @@ ...@@ -14,11 +14,6 @@
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-s390x</emulator> <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'/> <memballoon model='none'/>
<panic model='s390'/> <panic model='s390'/>
</devices> </devices>
......
...@@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \ ...@@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \
-nodefaults \ -nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \ -monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \ -no-acpi \
-boot c \ -boot c
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\
id=drive-virtio-disk0
...@@ -14,11 +14,6 @@ ...@@ -14,11 +14,6 @@
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-s390x</emulator> <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'/> <memballoon model='none'/>
<panic model='s390'/> <panic model='s390'/>
</devices> </devices>
......
...@@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \ ...@@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \
-nodefaults \ -nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \ -monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \ -no-acpi \
-boot c \ -boot c
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\
id=drive-virtio-disk0
...@@ -14,11 +14,6 @@ ...@@ -14,11 +14,6 @@
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<devices> <devices>
<emulator>/usr/bin/qemu-system-s390x</emulator> <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'/> <memballoon model='none'/>
<panic model='s390'/> <panic model='s390'/>
</devices> </devices>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册