External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-09 06:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "qemuxml2argvtest: Use real-caps testing for 'acpi-hotplug-bridge-disable'"

Browse Source 
This reverts commit 2d20f0bb05.

Conflicts:
 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.args
 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.args

  the test output of these files was regenerated because the tests
  were changed upstream to use JSON on the commandline at a later
  commit than the commit being reverted here (where they were changed
  to use latest caps, but the patches to use JSON on the commandline
  hadn't been committed yet).

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Ani Sinha <ani@anisinha.ca>
This commit is contained in:
Laine Stump 2021-10-20 14:46:57 -04:00
parent 85094a4d60
commit 1a786fda0e
9 changed files with 99 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.aarch64-latest.err → tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.err
View File

22
tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.xml
View File

@ -1,13 +1,33 @@
<domain type='qemu'>
<name>test</name>
<name>i440fx</name>
<uuid>56f5055c-1b8d-490c-844a-ad646a1caaaa</uuid>
<memory unit='KiB'>1048576</memory>
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
<type arch='aarch64' machine='virt'>hvm</type>
<boot dev='network'/>
</os>
<features>
<pci>
<acpi-bridge-hotplug state='off'/>
</pci>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>

31
tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.args Normal file
View File

@ -0,0 +1,31 @@
LC_ALL=C \
PATH=/bin \
HOME=/tmp/lib/domain--1-i440fx \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-i440fx/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-i440fx/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-i440fx/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=i440fx,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-i440fx/master-key.aes \
-machine pc-i440fx-2.5,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \
-display none \
-no-user-config \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-i440fx/monitor.sock,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=off \
-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on

0
tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.x86_64-6.0.0.err → tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.err
View File

34
tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.args
View File

@ -1,34 +0,0 @@
LC_ALL=C \
PATH=/bin \
HOME=/tmp/lib/domain--1-i440fx \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-i440fx/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-i440fx/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-i440fx/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=i440fx,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-i440fx/master-key.aes"}' \
-machine pc-i440fx-2.5,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-cpu qemu64 \
-m 1024 \
-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \
-display none \
-no-user-config \
-nodefaults \
-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=off \
-boot strict=on \
-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
-audiodev id=audio1,driver=none \
-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on

33
tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.args Normal file
View File

@ -0,0 +1,33 @@
LC_ALL=C \
PATH=/bin \
HOME=/tmp/lib/domain--1-q35 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35/master-key.aes \
-machine pc-q35-2.5,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \
-display none \
-no-user-config \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35/monitor.sock,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off \
-boot strict=on \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
-device ioh3420,port=8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1 \
-msg timestamp=on

1
tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.err Normal file
View File

@ -0,0 +1 @@
unsupported configuration: acpi-bridge-hotplug is not available with this QEMU binary

37
tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.args
View File

@ -1,37 +0,0 @@
LC_ALL=C \
PATH=/bin \
HOME=/tmp/lib/domain--1-q35 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35/.config \
/usr/bin/qemu-system-x86_64 \
-name guest=q35,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-q35/master-key.aes"}' \
-machine pc-q35-2.5,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-cpu qemu64 \
-m 1024 \
-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \
-display none \
-no-user-config \
-nodefaults \
-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off \
-boot strict=on \
-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}' \
-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \
-device '{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1"}' \
-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.3","addr":"0x0"}' \
-audiodev id=audio1,driver=none \
-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","addr":"0x1"}' \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on

17
tests/qemuxml2argvtest.c
View File

@ -2572,13 +2572,22 @@ mymain(void)
DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-enable");
DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-disable", "5.1.0");
DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-enable", "5.1.0");
DO_TEST_CAPS_LATEST("q35-acpi-hotplug-bridge-disable");
DO_TEST_CAPS_LATEST("pc-i440fx-acpi-hotplug-bridge-disable");
DO_TEST_CAPS_VER_PARSE_ERROR("q35-acpi-hotplug-bridge-disable", "6.0.0");
DO_TEST("q35-acpi-hotplug-bridge-disable",
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE);
DO_TEST("pc-i440fx-acpi-hotplug-bridge-disable",
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE);
DO_TEST_PARSE_ERROR_NOCAPS("q35-acpi-hotplug-bridge-disable");
DO_TEST_PARSE_ERROR_NOCAPS("pc-i440fx-acpi-hotplug-bridge-disable");
/* verify that we fail when acpi-bridge-hotplug option is specified for
* archs other than x86
*/
DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-acpi-hotplug-bridge-disable", "aarch64");
DO_TEST_PARSE_ERROR_NOCAPS("aarch64-acpi-hotplug-bridge-disable");
DO_TEST("q35-usb2",
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,