[PATCH 42/51] qemuxml2argvtest: Modernize 'cpu-(no)fallback' test

Previously without modern capabilities the test was relying on a CPU model which was not entered into a fake list of supported cpus. With real capabilities we have to pick a CPU model which is supported by libvirt but in some version is not supported by qemu. I've picked EPYC-Milan, which was introduced into qemu-6.0. This test configures a CPU which is equivalent to EPYC-Rome by disabling features from EPYC-Milan and uses a versioned real caps test to check it against a qemu which doesn't support EPYC-Milan. With real capabilities though, we can also do a positive test case by using a version whic doesh support it. I've specifically not used the LATEST caps so that it doesn't change once capabilities are bumped. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- .../cpu-fallback.x86_64-5.2.0.args | 34 +++++++++++++++++++ ...ck.args => cpu-fallback.x86_64-8.0.0.args} | 4 +-- tests/qemuxml2argvdata/cpu-fallback.xml | 15 +++++--- tests/qemuxml2argvdata/cpu-nofallback.err | 1 - .../cpu-nofallback.x86_64-5.2.0.err | 1 + .../cpu-nofallback.x86_64-8.0.0.args | 33 ++++++++++++++++++ tests/qemuxml2argvdata/cpu-nofallback.xml | 15 +++++--- tests/qemuxml2argvtest.c | 9 +++-- 8 files changed, 97 insertions(+), 15 deletions(-) create mode 100644 tests/qemuxml2argvdata/cpu-fallback.x86_64-5.2.0.args rename tests/qemuxml2argvdata/{cpu-fallback.args => cpu-fallback.x86_64-8.0.0.args} (86%) delete mode 100644 tests/qemuxml2argvdata/cpu-nofallback.err create mode 100644 tests/qemuxml2argvdata/cpu-nofallback.x86_64-5.2.0.err create mode 100644 tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-fallback.x86_64-5.2.0.args b/tests/qemuxml2argvdata/cpu-fallback.x86_64-5.2.0.args new file mode 100644 index 0000000000..ecc6bb3977 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-fallback.x86_64-5.2.0.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ +-machine pc-i440fx-5.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ +-cpu EPYC-Rome,amd-ssbd=off,erms=off,fsrm=off,invpcid=off,pcid=off,pku=off,xsaves=off \ +-m size=219136k \ +-object 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 \ +-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 \ +-boot strict=on \ +-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/qemuxml2argvdata/cpu-fallback.args b/tests/qemuxml2argvdata/cpu-fallback.x86_64-8.0.0.args similarity index 86% rename from tests/qemuxml2argvdata/cpu-fallback.args rename to tests/qemuxml2argvdata/cpu-fallback.x86_64-8.0.0.args index 995c006347..b0ce1dfcbd 100644 --- a/tests/qemuxml2argvdata/cpu-fallback.args +++ b/tests/qemuxml2argvdata/cpu-fallback.x86_64-8.0.0.args @@ -10,9 +10,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -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 \ +-machine pc-i440fx-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu Conroe,cx16=on,sse4.1=off,sse4.2=off,popcnt=off,aes=off \ +-cpu EPYC-Milan,amd-ssbd=off,erms=off,fsrm=off,ibrs=off,invpcid=off,pcid=off,pku=off,svme-addr-chk=off,xsaves=off \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-fallback.xml b/tests/qemuxml2argvdata/cpu-fallback.xml index f1a843b7e0..d5674f6d17 100644 --- a/tests/qemuxml2argvdata/cpu-fallback.xml +++ b/tests/qemuxml2argvdata/cpu-fallback.xml @@ -9,11 +9,16 @@ <boot dev='network'/> </os> <cpu match='exact'> - <model>Westmere</model> - <feature policy='disable' name='sse4.1'/> - <feature policy='disable' name='sse4.2'/> - <feature policy='disable' name='popcnt'/> - <feature policy='disable' name='aes'/> + <model>EPYC-Milan</model> + <feature policy='disable' name='amd-ssbd'/> + <feature policy='disable' name='erms'/> + <feature policy='disable' name='fsrm'/> + <feature policy='disable' name='ibrs'/> + <feature policy='disable' name='invpcid'/> + <feature policy='disable' name='pcid'/> + <feature policy='disable' name='pku'/> + <feature policy='disable' name='svme-addr-chk'/> + <feature policy='disable' name='xsaves'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxml2argvdata/cpu-nofallback.err b/tests/qemuxml2argvdata/cpu-nofallback.err deleted file mode 100644 index e5ba7473f2..0000000000 --- a/tests/qemuxml2argvdata/cpu-nofallback.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: CPU model Westmere is not supported by hypervisor diff --git a/tests/qemuxml2argvdata/cpu-nofallback.x86_64-5.2.0.err b/tests/qemuxml2argvdata/cpu-nofallback.x86_64-5.2.0.err new file mode 100644 index 0000000000..acea093d76 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-nofallback.x86_64-5.2.0.err @@ -0,0 +1 @@ +unsupported configuration: CPU model EPYC-Milan is not supported by hypervisor diff --git a/tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args b/tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args new file mode 100644 index 0000000000..b0ce1dfcbd --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-8.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel kvm \ +-cpu EPYC-Milan,amd-ssbd=off,erms=off,fsrm=off,ibrs=off,invpcid=off,pcid=off,pku=off,svme-addr-chk=off,xsaves=off \ +-m size=219136k \ +-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 \ +-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 \ +-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 diff --git a/tests/qemuxml2argvdata/cpu-nofallback.xml b/tests/qemuxml2argvdata/cpu-nofallback.xml index 8163c4c369..ce1414559f 100644 --- a/tests/qemuxml2argvdata/cpu-nofallback.xml +++ b/tests/qemuxml2argvdata/cpu-nofallback.xml @@ -9,11 +9,16 @@ <boot dev='network'/> </os> <cpu match='exact'> - <model fallback='forbid'>Westmere</model> - <feature policy='disable' name='sse4.1'/> - <feature policy='disable' name='sse4.2'/> - <feature policy='disable' name='popcnt'/> - <feature policy='disable' name='aes'/> + <model fallback='forbid'>EPYC-Milan</model> + <feature policy='disable' name='amd-ssbd'/> + <feature policy='disable' name='erms'/> + <feature policy='disable' name='fsrm'/> + <feature policy='disable' name='ibrs'/> + <feature policy='disable' name='invpcid'/> + <feature policy='disable' name='pcid'/> + <feature policy='disable' name='pku'/> + <feature policy='disable' name='svme-addr-chk'/> + <feature policy='disable' name='xsaves'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e2af688529..6997d7400c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1742,10 +1742,15 @@ mymain(void) DO_TEST("cpu-exact1", QEMU_CAPS_KVM); DO_TEST("cpu-exact2", QEMU_CAPS_KVM); DO_TEST("cpu-exact2-nofallback", QEMU_CAPS_KVM); - DO_TEST("cpu-fallback", QEMU_CAPS_KVM); - DO_TEST_FAILURE("cpu-nofallback", QEMU_CAPS_KVM); DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-strict1", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); DO_TEST("cpu-no-removed-features", QEMU_CAPS_KVM); + + /* EPYC-Milan became available in qemu-6.0, use it for the fallback tests */ + DO_TEST_CAPS_VER_FAILURE("cpu-nofallback", "5.2.0"); + DO_TEST_CAPS_VER("cpu-nofallback", "8.0.0"); + DO_TEST_CAPS_VER("cpu-fallback", "5.2.0"); + DO_TEST_CAPS_VER("cpu-fallback", "8.0.0"); + DO_TEST_NOCAPS("cpu-numa1"); DO_TEST_NOCAPS("cpu-numa2"); DO_TEST_NOCAPS("cpu-numa-no-memory-element"); -- 2.41.0