External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 13:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Initialize basic capabilities properly

Browse Source 
The capabilities used in test cases should match those used
during normal operation for the tests to make any sense.

This results in the generated command line for a few test
cases (most notably non-x86 test cases that were wrongly
assuming they could use -no-acpi) changing.
This commit is contained in:
Andrea Bolognani 2017-03-02 19:24:22 +01:00
parent a8fc7ef834
commit 1cf3e52abb
55 changed files with 7 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_capabilities.c
View File

@ -4301,7 +4301,7 @@ virQEMUCapsInitQMPArch(virQEMUCapsPtr qemuCaps,
*
* Initialize @qemuCaps with basic architecture-dependent capabilities.
*/
static void
void
virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps)
{
/* ACPI/HPET/KVM PIT are x86 specific */

2
src/qemu/qemu_capabilities.h
View File

@ -510,6 +510,8 @@ int virQEMUCapsParseHelpStr(const char *qemu,
const char *qmperr);
/* Only for use by test suite */
int virQEMUCapsParseDeviceStr(virQEMUCapsPtr qemuCaps, const char *str);
/* Only for use by test suite */
void virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps);
VIR_ENUM_DECL(virQEMUCaps);

1
tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args
View File

@ -15,5 +15,4 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-no-acpi \
-boot c

1
tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args
View File

@ -15,5 +15,4 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-no-acpi \
-boot c

1
tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args
View File

@ -15,5 +15,4 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-no-acpi \
-boot c

1
tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args
View File

@ -15,6 +15,5 @@ QEMU_AUDIO_DRV=none \
-nodefconfig \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a,deflate-on-oom=on

1
tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args
View File

@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-boot c \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0 \

1
tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args
View File

@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\

1
tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args
View File

@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-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 \

1
tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.args
View File

@ -15,5 +15,4 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-guest1/monitor.sock,server,nowait \
-no-acpi \
-boot c

1
tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.args
View File

@ -15,5 +15,4 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-guest1/monitor.sock,server,nowait \
-no-acpi \
-boot c

1
tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=0.0.0007,drive=drive-virtio-disk0,id=virtio-disk0 \

1
tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\

1
tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0

1
tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-device virtio-scsi-ccw,id=scsi0,devno=fe.0.0001 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \

1
tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args
View File

@ -15,7 +15,6 @@ QEMU_AUDIO_DRV=none \
-nodefconfig \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\

1
tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-ccw.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-device virtio-scsi-ccw,id=scsi0,devno=fe.0.0001 \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-virtio-disk0 \

1
tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args
View File

@ -22,6 +22,7 @@ host-nodes=1-3,policy=bind \
-monitor unix:/tmp/lib/domain--1-fedora/monitor.sock,server,nowait \
-rtc base=utc,driftfix=slew \
-no-kvm-pit-reinjection \
-no-hpet \
-global PIIX4_PM.disable_s3=1 \
-global PIIX4_PM.disable_s4=1 \
-boot c \

1
tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args
View File

@ -16,7 +16,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,iothread=iothread1,devno=fe.0.0000,\

1
tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.args
View File

@ -16,7 +16,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-device virtio-scsi-ccw,iothread=iothread2,id=scsi0,devno=fe.0.0001 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \

1
tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\

1
tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\

1
tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\

1
tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\

1
tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\

1
tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\

1
tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\

1
tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\

1
tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\

1
tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\

1
tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args
View File

@ -18,7 +18,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-kernel /media/ram/uImage \
-initrd /media/ram/ramdisk \

1
tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-device virtio-net-ccw,vlan=0,id=net0,mac=00:11:22:33:44:55,devno=fe.0.0001 \
-net user,vlan=0,name=hostnet0 \

1
tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-device virtio-net-s390,vlan=0,id=net0,mac=00:11:22:33:44:55 \
-net user,vlan=0,name=hostnet0

1
tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-kernel /media/ram/uImage \
-initrd /media/ram/ramdisk \

1
tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args
View File

@ -16,7 +16,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-boot c \
-kernel /media/ram/uImage \
-initrd /media/ram/ramdisk \

1
tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args
View File

@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-boot c \
-usb \
-chardev pty,id=charserial0 \

1
tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args
View File

@ -18,7 +18,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-boot c \
-usb \
-chardev pty,id=charserial0 \

1
tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args
View File

@ -18,7 +18,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-boot c \
-usb \
-chardev pty,id=charserial0 \

1
tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args
View File

@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-boot c \
-usb \
-chardev pty,id=charserial0 \

1
tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args
View File

@ -14,7 +14,6 @@ QEMU_AUDIO_DRV=none \
-nographic \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
-boot c \
-usb \
-global spapr-nvram.reg=0x4000

1
tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args
View File

@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-boot c \
-usb \
-chardev pty,id=charserial0 \

1
tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args
View File

@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-boot c \
-usb \
-chardev pty,id=charserial0 \

1
tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args
View File

@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-boot c \
-device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
-chardev pty,id=charserial0 \

1
tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args
View File

@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-boot c \
-device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
-chardev pty,id=charserial0 \

1
tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args
View File

@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-boot c \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1 \
-device pci-ohci,id=usb1,bus=pci.0,addr=0x2 \

1
tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args
View File

@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-boot c \
-device spapr-vscsi,id=scsi0,reg=0x2000 \
-device spapr-vscsi,id=scsi1,reg=0x30000000 \

1
tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args
View File

@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-boot c \
-device spapr-vscsi,id=scsi0,reg=0x2000 \
-device spapr-vscsi,id=scsi1,reg=0x3000 \

1
tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args
View File

@ -15,6 +15,7 @@ QEMU_AUDIO_DRV=spice \
-monitor unix:/tmp/lib/domain--1-virt-manager-basic/monitor.sock,server,nowait \
-rtc base=utc,driftfix=slew \
-no-kvm-pit-reinjection \
-no-hpet \
-global ICH9-LPC.disable_s3=1 \
-global ICH9-LPC.disable_s4=1 \
-boot c \

1
tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args
View File

@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-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 \

1
tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args
View File

@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-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 \

1
tests/qemuxml2argvdata/qemuxml2argv-s390-panic-missing.args
View File

@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-boot c \
-device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0000 \
-chardev pty,id=charconsole0 \

1
tests/qemuxml2argvdata/qemuxml2argv-s390-panic-no-address.args
View File

@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-boot c \
-device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0000 \
-chardev pty,id=charconsole0 \

1
tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args
View File

@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\

1
tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args
View File

@ -17,7 +17,6 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-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 \
-device diag288,id=watchdog0 \

4
tests/qemuxml2argvtest.c
View File

@ -360,8 +360,6 @@ testInitQEMUCaps(struct testInfo *info,
if (!(info->qemuCaps = virQEMUCapsNew()))
goto cleanup;
virQEMUCapsSet(info->qemuCaps, QEMU_CAPS_NO_ACPI);
if (testQemuCapsSetGIC(info->qemuCaps, gic) < 0)
goto cleanup;
@ -381,6 +379,8 @@ testUpdateQEMUCaps(const struct testInfo *info,
virQEMUCapsSetArch(info->qemuCaps, vm->def->os.arch);
virQEMUCapsInitQMPBasicArch(info->qemuCaps);
/* We need to pretend QEMU 2.0.0 is in use so that pSeries guests
* will get the correct alias assigned to their buses.
* See virQEMUCapsHasPCIMultiBus() */