The tested feature doesn't change across versions so we can use the
modern testing infrastructure.
Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
...ed.args => cpu-eoi-disabled.x86_64-latest.args} | 14 ++++++++------
tests/qemuxml2argvdata/cpu-eoi-disabled.xml | 2 +-
...led.args => cpu-eoi-enabled.x86_64-latest.args} | 14 ++++++++------
tests/qemuxml2argvdata/cpu-eoi-enabled.xml | 2 +-
tests/qemuxml2argvtest.c | 6 ++++--
tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml | 2 +-
7 files changed, 24 insertions(+), 18 deletions(-)
rename tests/qemuxml2argvdata/{cpu-eoi-disabled.args => cpu-eoi-disabled.x86_64-latest.args} (53%)
rename tests/qemuxml2argvdata/{cpu-eoi-enabled.args => cpu-eoi-enabled.x86_64-latest.args} (53%)
diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.args b/tests/qemuxml2argvdata/cpu-eoi-disabled.x86_64-latest.args
similarity index 53%
rename from tests/qemuxml2argvdata/cpu-eoi-disabled.args
rename to tests/qemuxml2argvdata/cpu-eoi-disabled.x86_64-latest.args
index b252446464..dfb4a53bfd 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.x86_64-latest.args
@@ -6,15 +6,15 @@ 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-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
-cpu qemu32,kvm-pv-eoi=off \
-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -26,6 +26,8 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-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
diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.xml b/tests/qemuxml2argvdata/cpu-eoi-disabled.xml
index 657de0482a..c93e75e3e5 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-disabled.xml
+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.xml
@@ -21,7 +21,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.args b/tests/qemuxml2argvdata/cpu-eoi-enabled.x86_64-latest.args
similarity index 53%
rename from tests/qemuxml2argvdata/cpu-eoi-enabled.args
rename to tests/qemuxml2argvdata/cpu-eoi-enabled.x86_64-latest.args
index 849593269d..155d5ecef7 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.x86_64-latest.args
@@ -6,15 +6,15 @@ 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-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-accel tcg \
-cpu qemu32,kvm-pv-eoi=on \
-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -26,6 +26,8 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-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
diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.xml b/tests/qemuxml2argvdata/cpu-eoi-enabled.xml
index bc8934f260..1c24398f42 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-enabled.xml
+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.xml
@@ -21,7 +21,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index bdfb47f0e5..17d7ee9ab0 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1247,8 +1247,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("controller-usb-order");
- DO_TEST_NOCAPS("cpu-eoi-disabled");
- DO_TEST_NOCAPS("cpu-eoi-enabled");
DO_TEST("controller-order",
QEMU_CAPS_KVM,
QEMU_CAPS_PIIX3_USB_UHCI,
@@ -1258,6 +1256,10 @@ mymain(void)
QEMU_CAPS_USB_HUB,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_DEVICE_CIRRUS_VGA);
+ /* 'eoi' cpu feature with an explicit CPU defined */
+ DO_TEST_CAPS_LATEST("cpu-eoi-disabled");
+ DO_TEST_CAPS_LATEST("cpu-eoi-enabled");
+ /* 'eoi' cpu feature without an explicit CPU defined */
DO_TEST_CAPS_VER("eoi-disabled", "4.0.0");
DO_TEST_CAPS_LATEST("eoi-disabled");
DO_TEST_CAPS_VER("eoi-enabled", "4.0.0");
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
index 7ae2c7034b..acd17da598 100644
--- a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
+++ b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
@@ -21,7 +21,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
index bee4fd0240..49900aea9a 100644
--- a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
+++ b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
@@ -21,7 +21,7 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
- <emulator>/usr/bin/qemu-system-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
--
2.36.1
