[PATCH v2 3/7] qemuxml2argvtest: Use real-caps testing for 'pc-i440fx-acpi-root-hotplug-disable'

[Peter Krempa]

We can use two real example configs to prove the support without the
need for using fake capabilities. Fix the recently added test cases.

Fixes: 133d7983d6c
Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 ...fx-acpi-root-hotplug-disable.x86_64-5.1.0.err} |  0
 ...-acpi-root-hotplug-disable.x86_64-latest.args} | 15 +++++++++------
 tests/qemuxml2argvtest.c                          |  5 ++---
 3 files changed, 11 insertions(+), 9 deletions(-)
 rename tests/qemuxml2argvdata/{pc-i440fx-acpi-root-hotplug-disable.err => pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err} (100%)
 rename tests/qemuxml2argvdata/{pc-i440fx-acpi-root-hotplug-disable.args => pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args} (55%)

diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.err b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err
similarity index 100%
rename from tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.err
rename to tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err
diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.args b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args
similarity index 55%
rename from tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.args
rename to tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args
index dd8ea503fc..056a925bc0 100644
--- a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.args
+++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args
@@ -6,26 +6,29 @@ 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 \
+-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 \
--realtime mlock=off \
+-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,path=/tmp/lib/domain--1-i440fx/monitor.sock,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
 -global PIIX4_PM.acpi-root-pci-hotplug=off \
--usb \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-audiodev id=audio1,driver=none \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 116ba714eb..0224bd1854 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2559,9 +2559,8 @@ mymain(void)
             QEMU_CAPS_DEVICE_IOH3420,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4);
-    DO_TEST("pc-i440fx-acpi-root-hotplug-disable",
-            QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG);
-    DO_TEST_PARSE_ERROR_NOCAPS("pc-i440fx-acpi-root-hotplug-disable");
+    DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-disable");
+    DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-disable", "5.1.0");
     DO_TEST("q35-acpi-hotplug-bridge-disable",
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420,
-- 
2.31.1