mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-22 22:13:18 +00:00
tests: qemuxml2argv: Remove redundant tests for the obsolete 'virtio-390' machine
Remove the console, disk, and network test for the legacy s390 machine which was removed in qemu 2.6. All of these have 'ccw' equivalents. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
ba77c61b9b
commit
54aad2b99d
@ -1,29 +0,0 @@
|
|||||||
LC_ALL=C \
|
|
||||||
PATH=/bin \
|
|
||||||
HOME=/tmp/lib/domain--1-QEMUGuest1 \
|
|
||||||
USER=test \
|
|
||||||
LOGNAME=test \
|
|
||||||
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
|
|
||||||
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
|
|
||||||
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
|
|
||||||
QEMU_AUDIO_DRV=none \
|
|
||||||
/usr/bin/qemu-system-s390x \
|
|
||||||
-name QEMUGuest1 \
|
|
||||||
-S \
|
|
||||||
-machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \
|
|
||||||
-m 214 \
|
|
||||||
-realtime mlock=off \
|
|
||||||
-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=on,wait=off \
|
|
||||||
-mon chardev=charmonitor,id=monitor,mode=control \
|
|
||||||
-rtc base=utc \
|
|
||||||
-no-shutdown \
|
|
||||||
-device virtio-serial-s390,id=virtio-serial0 \
|
|
||||||
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
|
|
||||||
-device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
|
|
||||||
-chardev pty,id=charconsole0 \
|
|
||||||
-device virtconsole,chardev=charconsole0,id=console0
|
|
@ -1,24 +0,0 @@
|
|||||||
<domain type='qemu'>
|
|
||||||
<name>QEMUGuest1</name>
|
|
||||||
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
||||||
<memory>219100</memory>
|
|
||||||
<currentMemory>219100</currentMemory>
|
|
||||||
<os>
|
|
||||||
<type arch='s390x' machine='s390-virtio'>hvm</type>
|
|
||||||
</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-s390x</emulator>
|
|
||||||
<disk type='block' device='disk'>
|
|
||||||
<source dev='/dev/HostVG/QEMUGuest1'/>
|
|
||||||
<target dev='hda' bus='virtio'/>
|
|
||||||
<boot order='1'/>
|
|
||||||
</disk>
|
|
||||||
<console type='pty'>
|
|
||||||
<target type='virtio'/>
|
|
||||||
</console>
|
|
||||||
</devices>
|
|
||||||
</domain>
|
|
@ -1,26 +0,0 @@
|
|||||||
LC_ALL=C \
|
|
||||||
PATH=/bin \
|
|
||||||
HOME=/tmp/lib/domain--1-QEMUGuest1 \
|
|
||||||
USER=test \
|
|
||||||
LOGNAME=test \
|
|
||||||
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
|
|
||||||
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
|
|
||||||
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
|
|
||||||
QEMU_AUDIO_DRV=none \
|
|
||||||
/usr/bin/qemu-system-s390x \
|
|
||||||
-name QEMUGuest1 \
|
|
||||||
-S \
|
|
||||||
-machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \
|
|
||||||
-m 214 \
|
|
||||||
-realtime mlock=off \
|
|
||||||
-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=on,wait=off \
|
|
||||||
-mon chardev=charmonitor,id=monitor,mode=control \
|
|
||||||
-rtc base=utc \
|
|
||||||
-no-shutdown \
|
|
||||||
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
|
|
||||||
-device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1
|
|
@ -1,22 +0,0 @@
|
|||||||
<domain type='qemu'>
|
|
||||||
<name>QEMUGuest1</name>
|
|
||||||
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
||||||
<memory>219136</memory>
|
|
||||||
<currentMemory>219136</currentMemory>
|
|
||||||
<vcpu>1</vcpu>
|
|
||||||
<os>
|
|
||||||
<type arch='s390x' machine='s390-virtio'>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-s390x</emulator>
|
|
||||||
<disk type='block' device='disk'>
|
|
||||||
<source dev='/dev/HostVG/QEMUGuest1'/>
|
|
||||||
<target dev='hda' bus='virtio'/>
|
|
||||||
</disk>
|
|
||||||
</devices>
|
|
||||||
</domain>
|
|
@ -1,26 +0,0 @@
|
|||||||
LC_ALL=C \
|
|
||||||
PATH=/bin \
|
|
||||||
HOME=/tmp/lib/domain--1-QEMUGuest1 \
|
|
||||||
USER=test \
|
|
||||||
LOGNAME=test \
|
|
||||||
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
|
|
||||||
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
|
|
||||||
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
|
|
||||||
QEMU_AUDIO_DRV=none \
|
|
||||||
/usr/bin/qemu-system-s390x \
|
|
||||||
-name QEMUGuest1 \
|
|
||||||
-S \
|
|
||||||
-machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \
|
|
||||||
-m 214 \
|
|
||||||
-realtime mlock=off \
|
|
||||||
-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=on,wait=off \
|
|
||||||
-mon chardev=charmonitor,id=monitor,mode=control \
|
|
||||||
-rtc base=utc \
|
|
||||||
-no-shutdown \
|
|
||||||
-netdev user,id=hostnet0 \
|
|
||||||
-device virtio-net-s390,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55
|
|
@ -1,22 +0,0 @@
|
|||||||
<domain type='qemu'>
|
|
||||||
<name>QEMUGuest1</name>
|
|
||||||
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
||||||
<memory>219136</memory>
|
|
||||||
<currentMemory>219136</currentMemory>
|
|
||||||
<vcpu>1</vcpu>
|
|
||||||
<os>
|
|
||||||
<type arch='s390x' machine='s390-virtio'>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-s390x</emulator>
|
|
||||||
<interface type='user'>
|
|
||||||
<mac address='00:11:22:33:44:55'/>
|
|
||||||
<model type='virtio'/>
|
|
||||||
</interface>
|
|
||||||
</devices>
|
|
||||||
</domain>
|
|
@ -1336,8 +1336,6 @@ mymain(void)
|
|||||||
DO_TEST_FAILURE("disk-floppy-pseries",
|
DO_TEST_FAILURE("disk-floppy-pseries",
|
||||||
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
|
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
|
||||||
DO_TEST("disk-floppy-tray", NONE);
|
DO_TEST("disk-floppy-tray", NONE);
|
||||||
DO_TEST("disk-virtio-s390",
|
|
||||||
QEMU_CAPS_VIRTIO_S390);
|
|
||||||
DO_TEST("disk-virtio", NONE);
|
DO_TEST("disk-virtio", NONE);
|
||||||
DO_TEST("disk-virtio-ccw",
|
DO_TEST("disk-virtio-ccw",
|
||||||
QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
|
QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
|
||||||
@ -1634,8 +1632,6 @@ mymain(void)
|
|||||||
QEMU_CAPS_VIRTIO_TX_ALG);
|
QEMU_CAPS_VIRTIO_TX_ALG);
|
||||||
DO_TEST("net-virtio-disable-offloads", NONE);
|
DO_TEST("net-virtio-disable-offloads", NONE);
|
||||||
DO_TEST("net-virtio-netdev", NONE);
|
DO_TEST("net-virtio-netdev", NONE);
|
||||||
DO_TEST("net-virtio-s390",
|
|
||||||
QEMU_CAPS_VIRTIO_S390);
|
|
||||||
DO_TEST("net-virtio-ccw",
|
DO_TEST("net-virtio-ccw",
|
||||||
QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
|
QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
|
||||||
DO_TEST("net-virtio-rxtxqueuesize",
|
DO_TEST("net-virtio-rxtxqueuesize",
|
||||||
@ -1756,8 +1752,6 @@ mymain(void)
|
|||||||
DO_TEST("console-virtio", NONE);
|
DO_TEST("console-virtio", NONE);
|
||||||
DO_TEST("console-virtio-many",
|
DO_TEST("console-virtio-many",
|
||||||
QEMU_CAPS_DEVICE_ISA_SERIAL);
|
QEMU_CAPS_DEVICE_ISA_SERIAL);
|
||||||
DO_TEST("console-virtio-s390",
|
|
||||||
QEMU_CAPS_VIRTIO_S390);
|
|
||||||
DO_TEST("console-virtio-ccw",
|
DO_TEST("console-virtio-ccw",
|
||||||
QEMU_CAPS_CCW,
|
QEMU_CAPS_CCW,
|
||||||
QEMU_CAPS_VIRTIO_S390);
|
QEMU_CAPS_VIRTIO_S390);
|
||||||
|
Loading…
Reference in New Issue
Block a user