[PATCH 06/10] qemuxmlconftest: Pin 'disk-network-gluster' case to qemu-9.1
The gluster protocol was deprecated in qemu-9.2.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...6_64-latest.args => disk-network-gluster.x86_64-9.1.0.args} | 2 +-
...x86_64-latest.xml => disk-network-gluster.x86_64-9.1.0.xml} | 2 +-
tests/qemuxmlconfdata/disk-network-gluster.xml | 2 +-
tests/qemuxmlconftest.c | 3 ++-
4 files changed, 5 insertions(+), 4 deletions(-)
rename tests/qemuxmlconfdata/{disk-network-gluster.x86_64-latest.args =>
disk-network-gluster.x86_64-9.1.0.args} (96%)
rename tests/qemuxmlconfdata/{disk-network-gluster.x86_64-latest.xml =>
disk-network-gluster.x86_64-9.1.0.xml} (97%)
diff --git a/tests/qemuxmlconfdata/disk-network-gluster.x86_64-latest.args
b/tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.args
similarity index 96%
rename from tests/qemuxmlconfdata/disk-network-gluster.x86_64-latest.args
rename to tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.args
index 786917ef88..7cf4c4404b 100644
--- a/tests/qemuxmlconfdata/disk-network-gluster.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.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,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine pc-i440fx-9.1,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
-accel tcg \
-cpu qemu64 \
-m size=219136k \
diff --git a/tests/qemuxmlconfdata/disk-network-gluster.x86_64-latest.xml
b/tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.xml
similarity index 97%
rename from tests/qemuxmlconfdata/disk-network-gluster.x86_64-latest.xml
rename to tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.xml
index 3213a6d7c4..9195e67bf5 100644
--- a/tests/qemuxmlconfdata/disk-network-gluster.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='x86_64' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc-i440fx-9.1'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
diff --git a/tests/qemuxmlconfdata/disk-network-gluster.xml
b/tests/qemuxmlconfdata/disk-network-gluster.xml
index 2ff28ad3a0..a6679fcc89 100644
--- a/tests/qemuxmlconfdata/disk-network-gluster.xml
+++ b/tests/qemuxmlconfdata/disk-network-gluster.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='x86_64' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc-i440fx-9.1'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index dfcf67d2d0..91daf955f5 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -1576,7 +1576,8 @@ mymain(void)
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrettype");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-source-auth-both");
- DO_TEST_CAPS_LATEST("disk-network-gluster");
+ /* 'gluster' protocol backend was deprecated in qemu-9.2 */
+ DO_TEST_CAPS_VER("disk-network-gluster", "9.1.0");
DO_TEST_CAPS_LATEST("disk-network-rbd");
DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-rbd-encryption",
"6.0.0");
DO_TEST_CAPS_LATEST("disk-network-rbd-encryption");
--
2.46.2