qemuxmlconftest: Switch sgx-epc to 11.0.0

The sgx-epc test case is currently pinned to capabilities of that
QEMU-7.0. Well, soon the minimal version of QEMU is going to be
bumped. But thanks to previous commit the capabilities of 11.0.0
version support SGX too. Switch the test case to the newer
capabilities.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/tests/qemuxmlconfdata/sgx-epc.x86_64-7.0.0.args b/tests/qemuxmlconfdata/sgx-epc.x86_64-latest+sgx.args
similarity index 83%
rename from tests/qemuxmlconfdata/sgx-epc.x86_64-7.0.0.args
rename to tests/qemuxmlconfdata/sgx-epc.x86_64-latest+sgx.args
index c046c83ff177e1d5d4ae74ad10f2563f0508ef68..e7cfb7dade7dc102bc555b23f772c97732447d21 100644 (file)
--- a/tests/qemuxmlconfdata/sgx-epc.x86_64-7.0.0.args
+++ b/tests/qemuxmlconfdata/sgx-epc.x86_64-latest+sgx.args
@@ -10,7 +10,7 @@ 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-q35-7.0,usb=off,dump-guest-core=off,sgx-epc.0.memdev=memepc0,sgx-epc.0.node=0,sgx-epc.1.memdev=memepc1,sgx-epc.1.node=1 \
+-machine pc-q35-7.0,usb=off,dump-guest-core=off,sgx-epc.0.memdev=memepc0,sgx-epc.0.node=0,sgx-epc.1.memdev=memepc1,sgx-epc.1.node=1,acpi=off \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k,slots=16,maxmem=1130496k \
@@ -28,12 +28,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
--no-acpi \
 -boot strict=on \
 -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \
 -device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \
--object '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864,"host-nodes":[0,1],"policy":"bind"}' \
--object '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216,"host-nodes":[0,1],"policy":"bind"}' \
+-object '{"qom-type":"thread-context","id":"tc-memepc0","node-affinity":[0,1]}' \
+-object '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864,"host-nodes":[0,1],"policy":"bind","prealloc-context":"tc-memepc0"}' \
+-object '{"qom-type":"thread-context","id":"tc-memepc1","node-affinity":[0,1]}' \
+-object '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216,"host-nodes":[0,1],"policy":"bind","prealloc-context":"tc-memepc1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -global ICH9-LPC.noreboot=off \
 -watchdog-action reset \

diff --git a/tests/qemuxmlconfdata/sgx-epc.x86_64-7.0.0.xml b/tests/qemuxmlconfdata/sgx-epc.x86_64-latest+sgx.xml
similarity index 100%
rename from tests/qemuxmlconfdata/sgx-epc.x86_64-7.0.0.xml
rename to tests/qemuxmlconfdata/sgx-epc.x86_64-latest+sgx.xml

diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 958e9bd68ce6ff6b52d6f6a7d62354fc63f41e80..6cfbca21a6bd8788127801c77e91e15ef382557f 100644 (file)
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -2997,7 +2997,8 @@ mymain(void)
     DO_TEST_CAPS_LATEST("cpu-phys-bits-limit");
     DO_TEST_CAPS_LATEST("cpu-phys-bits-emulate-bare");
 
-    DO_TEST_CAPS_VER("sgx-epc", "7.0.0");
+    DO_TEST_CAPS_ARCH_LATEST_FULL("sgx-epc", "x86_64",
+                                  ARG_CAPS_VARIANT, "+sgx", ARG_END);
 
     DO_TEST_CAPS_LATEST("crypto-builtin");