[PATCH 40/51] qemuxml2argvtest: Modernize 'cpu-minimum' cases
Use real capabilities, but select the fake 'Haswell' host CPU for test
stability.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../{cpu-minimum1.args => cpu-minimum1.x86_64-latest.args} | 2 +-
.../{cpu-minimum2.args => cpu-minimum2.x86_64-latest.args} | 2 +-
tests/qemuxml2argvtest.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
rename tests/qemuxml2argvdata/{cpu-minimum1.args => cpu-minimum1.x86_64-latest.args}
(87%)
rename tests/qemuxml2argvdata/{cpu-minimum2.args => cpu-minimum2.x86_64-latest.args}
(86%)
diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args
b/tests/qemuxml2argvdata/cpu-minimum1.x86_64-latest.args
similarity index 87%
rename from tests/qemuxml2argvdata/cpu-minimum1.args
rename to tests/qemuxml2argvdata/cpu-minimum1.x86_64-latest.args
index e6454e5870..a92da44bd8 100644
--- a/tests/qemuxml2argvdata/cpu-minimum1.args
+++ b/tests/qemuxml2argvdata/cpu-minimum1.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel kvm \
--cpu
core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on
\
+-cpu
Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args
b/tests/qemuxml2argvdata/cpu-minimum2.x86_64-latest.args
similarity index 86%
rename from tests/qemuxml2argvdata/cpu-minimum2.args
rename to tests/qemuxml2argvdata/cpu-minimum2.x86_64-latest.args
index 6e87b6be88..62e0101568 100644
--- a/tests/qemuxml2argvdata/cpu-minimum2.args
+++ b/tests/qemuxml2argvdata/cpu-minimum2.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}'
\
-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel kvm \
--cpu
core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on,syscall=off,nx=off,lm=off,svm=off
\
+-cpu
Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on,syscall=off,nx=off,lm=off,svm=off
\
-m size=219136k \
-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'
\
-overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index a3e137e1c1..7fc564d3ef 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1737,8 +1737,8 @@ mymain(void)
DO_TEST_CAPS_LATEST("cpu-topology3");
DO_TEST_CAPS_LATEST("cpu-topology4");
- DO_TEST("cpu-minimum1", QEMU_CAPS_KVM);
- DO_TEST("cpu-minimum2", QEMU_CAPS_KVM);
+ DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-minimum1", "x86_64",
ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
+ DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-minimum2", "x86_64",
ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
DO_TEST("cpu-exact1", QEMU_CAPS_KVM);
DO_TEST("cpu-exact2", QEMU_CAPS_KVM);
DO_TEST("cpu-exact2-nofallback", QEMU_CAPS_KVM);
--
2.41.0