[PATCH v2 3/4] tests: qemuxml2argv: Lock in "disk-network-tlsx509-vxhs" case to qemu-5.0.0

Peter Krempa pkrempa at redhat.com
Thu Jul 30 15:49:47 UTC 2020


QEMU 5.1 will drop the vxhs driver.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 ...-latest.args => disk-network-tlsx509-vxhs.x86_64-5.0.0.args} | 2 +-
 tests/qemuxml2argvtest.c                                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename tests/qemuxml2argvdata/{disk-network-tlsx509-vxhs.x86_64-latest.args => disk-network-tlsx509-vxhs.x86_64-5.0.0.args} (98%)

diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args
similarity index 98%
rename from tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-latest.args
rename to tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args
index f66f24144d..a21f322dfb 100644
--- a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args
@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
 -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-5.0,accel=tcg,usb=off,dump-guest-core=off \
 -cpu qemu64 \
 -m 214 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index ed79406b82..e0e3d0d4a9 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1195,7 +1195,7 @@ mymain(void)
     DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "2.12.0");
     DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "2.12.0");
     DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd");
-    DO_TEST_CAPS_LATEST("disk-network-tlsx509-vxhs");
+    DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "5.0.0");
     DO_TEST_CAPS_LATEST("disk-network-http");
     driver.config->vxhsTLS = 0;
     VIR_FREE(driver.config->vxhsTLSx509certdir);
-- 
2.26.2




More information about the libvir-list mailing list