[PATCH 01/14] qemuxml2argvtest: Use real caps in "graphics-vnc-tls" case
Replace the fake caps invocation with invocation bidnig it to the oldest
supported qemu version.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...s-vnc-tls.args => graphics-vnc-tls.x86_64-2.11.0.args} | 8 +++++---
tests/qemuxml2argvtest.c | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
rename tests/qemuxml2argvdata/{graphics-vnc-tls.args =>
graphics-vnc-tls.x86_64-2.11.0.args} (71%)
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.args
b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args
similarity index 71%
rename from tests/qemuxml2argvdata/graphics-vnc-tls.args
rename to tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args
index 34559c0d25..5c1e7780d9 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.11.0.args
@@ -12,7 +12,7 @@ SASL_CONF_PATH=/root/.sasl2 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc-i440fx-2.11,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
@@ -25,7 +25,9 @@ SASL_CONF_PATH=/root/.sasl2 \
-no-shutdown \
-no-acpi \
-boot strict=on \
--usb \
--vnc 127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-object
tls-creds-x509,id=vnc-tls-creds0,dir=/etc/pki/libvirt-vnc,endpoint=server,verify-peer=on
\
+-vnc 127.0.0.1:3,tls-creds=vnc-tls-creds0,sasl=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index c696424f8f..c3ba9df9af 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1479,7 +1479,7 @@ mymain(void)
DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
driver.config->vncTLS = 1;
driver.config->vncTLSx509verify = 1;
- DO_TEST("graphics-vnc-tls", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
+ DO_TEST_CAPS_VER("graphics-vnc-tls", "2.11.0");
DO_TEST_CAPS_LATEST("graphics-vnc-tls");
driver.config->vncTLSx509secretUUID =
g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea");
DO_TEST_CAPS_VER("graphics-vnc-tls-secret", "5.2.0");
--
2.31.1