External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuxmlconftest: Pin 'disk-network-gluster' case to qemu-9.1

Browse Source 
The gluster protocol was deprecated in qemu-9.2.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2024-10-10 17:54:01 +02:00
parent 4beb255138
commit 050398a4c3
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemuxmlconfdata/disk-network-gluster.x86_64-latest.args → tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.args
View File

@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-name guest=QEMUGuest1,debug-threads=on \ -name guest=QEMUGuest1,debug-threads=on \
-S \ -S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -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 \ -accel tcg \
-cpu qemu64 \ -cpu qemu64 \
-m size=219136k \ -m size=219136k \

2
tests/qemuxmlconfdata/disk-network-gluster.x86_64-latest.xml → tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory> <currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc'>hvm</type> <type arch='x86_64' machine='pc-i440fx-9.1'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<cpu mode='custom' match='exact' check='none'> <cpu mode='custom' match='exact' check='none'>

2
tests/qemuxmlconfdata/disk-network-gluster.xml
View File

@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219136</currentMemory> <currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='x86_64' machine='pc'>hvm</type> <type arch='x86_64' machine='pc-i440fx-9.1'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>

3
tests/qemuxmlconftest.c
View File

@ -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-secrettype-invalid");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrettype"); 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_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_LATEST("disk-network-rbd");
DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-rbd-encryption", "6.0.0"); DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-rbd-encryption", "6.0.0");
DO_TEST_CAPS_LATEST("disk-network-rbd-encryption"); DO_TEST_CAPS_LATEST("disk-network-rbd-encryption");