From: Peter Krempa Date: Wed, 18 Aug 2021 11:45:30 +0000 (+0200) Subject: qemuxml2argvdata: Don't use 'host-model' cpu in 'hugepages-memaccess3' X-Git-Tag: v7.7.0-rc1~33 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e5c4d99990dda29338d8f8cfb0d5ff5535a9dde;p=thirdparty%2Flibvirt.git qemuxml2argvdata: Don't use 'host-model' cpu in 'hugepages-memaccess3' The test case doesn't really test anything about the specific CPU. Using a host-model cpu with DO_TEST_CAPS_LATEST results in commandline changes every time qemu updates the cpu definiton. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args index f6c5e116d8..ae5b48aa1c 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args @@ -11,7 +11,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \ -machine pc-i440fx-2.9,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ --cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,svm=off,npt=off,nrip-save=off \ +-cpu qemu64 \ -m 4096 \ -object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-fedora","share":true,"x-use-canonical-path-for-ramblock-id":false,"prealloc":true,"size":4294967296}' \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.xml b/tests/qemuxml2argvdata/hugepages-memaccess3.xml index 43c3ec688b..a9d2cd9da0 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess3.xml +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.xml @@ -12,9 +12,6 @@ hvm - - - destroy restart destroy