mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
Revert "qemuxml2argvtest: Add '-enable' variants for ACPI-hotplug related cases"
This reverts commit 64146031058906804b3c5f519570fadc9ff4df48. Conflicts: tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-latest.args tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.args tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.args These files are unrelated to the functionality we need to remove, so they weren't removed, and the associated test cases weren't removed from qemuxml2argvtest.c 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:
parent
ea373d6c07
commit
85094a4d60
@ -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=on \
|
||||
-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
|
@ -1 +0,0 @@
|
||||
unsupported configuration: acpi-bridge-hotplug is not available with this QEMU binary
|
@ -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=on \
|
||||
-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
|
@ -2573,11 +2573,8 @@ mymain(void)
|
||||
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("q35-acpi-hotplug-bridge-enable");
|
||||
DO_TEST_CAPS_LATEST("pc-i440fx-acpi-hotplug-bridge-disable");
|
||||
DO_TEST_CAPS_LATEST("pc-i440fx-acpi-hotplug-bridge-enable");
|
||||
DO_TEST_CAPS_VER_PARSE_ERROR("q35-acpi-hotplug-bridge-disable", "6.0.0");
|
||||
DO_TEST_CAPS_VER_PARSE_ERROR("q35-acpi-hotplug-bridge-enable", "6.0.0");
|
||||
/* verify that we fail when acpi-bridge-hotplug option is specified for
|
||||
* archs other than x86
|
||||
*/
|
||||
|
Loading…
x
Reference in New Issue
Block a user