On Wed, 2021-11-03 at 11:53 +0100, Ján Tomko wrote:
> For later QEMUs than 2.11 we do FD passing for character devices,
> so lock the capabilites to this exact version.
>
> Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
Reviewed-by: Tim Wiederhake <twiederh@xxxxxxxxxx>
> ---
> ...-escape.args => name-escape.x86_64-2.11.0.args} | 7 ++++---
> tests/qemuxml2argvtest.c | 14 +-----------
> --
> 2 files changed, 5 insertions(+), 16 deletions(-)
> rename tests/qemuxml2argvdata/{name-escape.args => name-
> escape.x86_64-2.11.0.args} (90%)
>
> diff --git a/tests/qemuxml2argvdata/name-escape.args
> b/tests/qemuxml2argvdata/name-escape.x86_64-2.11.0.args
> similarity index 90%
> rename from tests/qemuxml2argvdata/name-escape.args
> rename to tests/qemuxml2argvdata/name-escape.x86_64-2.11.0.args
> index eb8d9ac10a..71770dc546 100644
> --- a/tests/qemuxml2argvdata/name-escape.args
> +++ b/tests/qemuxml2argvdata/name-escape.x86_64-2.11.0.args
> @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=spice \
> -name guest=foo=1,,bar=2,debug-threads=on \
> -S \
> -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-
> foo=1,,bar=2/master-key.aes \
> --machine pc,accel=tcg,usb=off,dump-guest-core=off \
> +-machine pc-i440fx-2.11,accel=tcg,usb=off,dump-guest-core=off \
> -m 214 \
> -realtime mlock=off \
> -smp 1,sockets=1,cores=1,threads=1 \
> @@ -24,11 +24,11 @@ QEMU_AUDIO_DRV=spice \
> -no-shutdown \
> -no-acpi \
> -boot strict=on \
> +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
> -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
> --usb \
> -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
> -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-
> ide0-0-0,cache=none,throttling.bps-total=5000,throttling.iops-
> total=6000,throttling.bps-total-max=10000,throttling.iops-total-
> max=11000,throttling.group=libvirt_iotune_group1,,foo \
> --device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-
> 0,bootindex=1 \
> +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-
> 0,bootindex=1,write-cache=on \
> -device ccid-card-
> emulated,backend=certificates,cert1=cert1,,foo,cert2=cert2,cert3=cert
> 3,db=/etc/pki/nssdb,,foo,id=smartcard0,bus=ccid0.0 \
> -chardev tty,id=charserial0,path=/dev/ttyS2,,foo \
> -device isa-serial,chardev=charserial0,id=serial0 \
> @@ -42,4 +42,5 @@ QEMU_AUDIO_DRV=spice \
> -drive
> file.driver=iscsi,file.portal=example.foo.org:3260,file.target=iqn.19
> 92-
> 01.com.example:my,,storage,file.lun=1,file.transport=tcp,if=none,form
> at=raw,id=drive-hostdev0 \
> -device scsi-generic,drive=drive-
> hostdev0,id=hostdev0,bus=scsi0.0,channel=0,scsi-id=0,lun=4 \
> -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
> +-sandbox
> on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=de
> ny \
> -msg timestamp=on
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index a171a978bd..a0498a0d92 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -3178,19 +3178,7 @@ mymain(void)
> ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE,
> ARG_END);
>
> - DO_TEST("name-escape",
> - QEMU_CAPS_VNC,
> - QEMU_CAPS_DEVICE_CIRRUS_VGA,
> - QEMU_CAPS_SPICE,
> - QEMU_CAPS_SPICE_UNIX,
> - QEMU_CAPS_DEVICE_VIRTIO_GPU,
> - QEMU_CAPS_VIRTIO_GPU_VIRGL,
> - QEMU_CAPS_SPICE_GL,
> - QEMU_CAPS_SPICE_RENDERNODE,
> - QEMU_CAPS_DEVICE_ISA_SERIAL,
> - QEMU_CAPS_CHARDEV_FILE_APPEND,
> - QEMU_CAPS_CCID_EMULATED,
> - QEMU_CAPS_VIRTIO_SCSI);
> + DO_TEST_CAPS_VER("name-escape", "2.11.0");
>
> DO_TEST_NOCAPS("master-key");
> DO_TEST("usb-long-port-path",
