[PATCH 1/3] qemuxml2argvtest: Use different network storage protocol for boot order tests

The support for 'sheepdog' was dropped from qemu-6.1 and later, to convert the tests to latest caps we need to use something else. Use 'nbd'. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/qemuxml2argvdata/boot-dev+order.xml | 2 +- tests/qemuxml2argvdata/boot-order.args | 2 +- tests/qemuxml2argvdata/boot-order.xml | 2 +- tests/qemuxml2xmloutdata/boot-order.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/qemuxml2argvdata/boot-dev+order.xml b/tests/qemuxml2argvdata/boot-dev+order.xml index e4bb3b1f48..8a25161d1f 100644 --- a/tests/qemuxml2argvdata/boot-dev+order.xml +++ b/tests/qemuxml2argvdata/boot-dev+order.xml @@ -30,7 +30,7 @@ </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> - <source protocol='sheepdog' name='image'> + <source protocol='nbd' name='image'> <host name='example.org' port='6000'/> </source> <target dev='vda' bus='virtio'/> diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdata/boot-order.args index 6d465ff2a8..ab90d22b28 100644 --- a/tests/qemuxml2argvdata/boot-order.args +++ b/tests/qemuxml2argvdata/boot-order.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"file","filename":"/root/boot.iso","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw","file":"libvirt-3-storage"}' \ -device ide-cd,bus=ide.1,unit=0,drive=libvirt-3-format,id=ide0-1-0,bootindex=1 \ --blockdev '{"driver":"sheepdog","server":{"type":"inet","host":"example.org","port":"6000"},"vdi":"image","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","port":"6000"},"export":"image","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}' \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-2-format,id=virtio-disk0,bootindex=3 \ -blockdev '{"driver":"file","filename":"/dev/null","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/boot-order.xml b/tests/qemuxml2argvdata/boot-order.xml index 6a95658ad2..a810f46021 100644 --- a/tests/qemuxml2argvdata/boot-order.xml +++ b/tests/qemuxml2argvdata/boot-order.xml @@ -27,7 +27,7 @@ </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> - <source protocol='sheepdog' name='image'> + <source protocol='nbd' name='image'> <host name='example.org' port='6000'/> </source> <target dev='vda' bus='virtio'/> diff --git a/tests/qemuxml2xmloutdata/boot-order.xml b/tests/qemuxml2xmloutdata/boot-order.xml index 0d884152dd..59568214eb 100644 --- a/tests/qemuxml2xmloutdata/boot-order.xml +++ b/tests/qemuxml2xmloutdata/boot-order.xml @@ -29,7 +29,7 @@ </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> - <source protocol='sheepdog' name='image'> + <source protocol='nbd' name='image'> <host name='example.org' port='6000'/> </source> <target dev='vda' bus='virtio'/> -- 2.37.1