From 985fd74bd3772b8088d8ede45c6d4ba64255c2c6 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 17 May 2021 10:38:25 +0200 Subject: [PATCH] qemuxml2argvtest: Limit 'disk-network-sheepdog' testcase to qemu-6.0.0 QEMU is dropping sheepdog support in 6.1 so we need to limit the test case to the latest version supporting sheepdog as it won't be described by the QMP schema any more. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- ...6_64-latest.args => disk-network-sheepdog.x86_64-6.0.0.args} | 2 +- tests/qemuxml2argvtest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename tests/qemuxml2argvdata/{disk-network-sheepdog.x86_64-latest.args => disk-network-sheepdog.x86_64-6.0.0.args} (95%) diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-6.0.0.args similarity index 95% rename from tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args rename to tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-6.0.0.args index a0c663229c..078ad6be09 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-6.0.0.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc-i440fx-6.0,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ -cpu qemu64 \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d5e59fe474..25b0c81f21 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1395,7 +1395,7 @@ mymain(void) DO_TEST_FAILURE("disk-network-rbd-no-colon", NONE); DO_TEST("disk-network-sheepdog", NONE); DO_TEST_CAPS_VER("disk-network-sheepdog", "2.12.0"); - DO_TEST_CAPS_LATEST("disk-network-sheepdog"); + DO_TEST_CAPS_VER("disk-network-sheepdog", "6.0.0"); DO_TEST("disk-network-source-auth", NONE); DO_TEST_CAPS_VER("disk-network-source-auth", "2.12.0"); DO_TEST_CAPS_LATEST("disk-network-source-auth");