[PATCH 18/20] qemuxml2argvtest: Use versioned ("4.1.0") capabilities for pre '-audiodev' cases

Use real caps instead of fake caps for the legacy cases. This will also show us when we can remove the old-style code. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- ...args => audio-alsa-best.x86_64-4.1.0.args} | 9 +-- ...l.err => audio-alsa-full.x86_64-4.1.0.err} | 0 ...s => audio-alsa-minimal.x86_64-4.1.0.args} | 9 +-- ...=> audio-coreaudio-best.x86_64-4.1.0.args} | 9 +-- ... => audio-coreaudio-full.x86_64-4.1.0.err} | 0 ...audio-coreaudio-minimal.x86_64-4.1.0.args} | 9 +-- ...udio-default-nographics.x86_64-4.1.0.args} | 9 +-- ...args => audio-file-best.x86_64-4.1.0.args} | 9 +-- ...l.err => audio-file-full.x86_64-4.1.0.err} | 0 ...s => audio-file-minimal.x86_64-4.1.0.args} | 9 +-- ...l.err => audio-jack-full.x86_64-4.1.0.err} | 0 ...rr => audio-jack-minimal.x86_64-4.1.0.err} | 0 ...r => audio-many-backends.x86_64-4.1.0.err} | 0 ...args => audio-none-best.x86_64-4.1.0.args} | 9 +-- ...l.err => audio-none-full.x86_64-4.1.0.err} | 0 ...s => audio-none-minimal.x86_64-4.1.0.args} | 9 +-- ....args => audio-oss-best.x86_64-4.1.0.args} | 9 +-- ...ll.err => audio-oss-full.x86_64-4.1.0.err} | 0 ...gs => audio-oss-minimal.x86_64-4.1.0.args} | 9 +-- ...> audio-pulseaudio-best.x86_64-4.1.0.args} | 9 +-- ...=> audio-pulseaudio-full.x86_64-4.1.0.err} | 0 ...udio-pulseaudio-minimal.x86_64-4.1.0.args} | 9 +-- ....args => audio-sdl-best.x86_64-4.1.0.args} | 9 +-- ...ll.err => audio-sdl-full.x86_64-4.1.0.err} | 0 ...gs => audio-sdl-minimal.x86_64-4.1.0.args} | 9 +-- ...rgs => audio-spice-best.x86_64-4.1.0.args} | 9 +-- ....err => audio-spice-full.x86_64-4.1.0.err} | 0 ... => audio-spice-minimal.x86_64-4.1.0.args} | 9 +-- tests/qemuxml2argvtest.c | 56 +++++++++---------- 29 files changed, 113 insertions(+), 96 deletions(-) rename tests/qemuxml2argvdata/{audio-alsa-best.args => audio-alsa-best.x86_64-4.1.0.args} (81%) rename tests/qemuxml2argvdata/{audio-alsa-full.err => audio-alsa-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-alsa-minimal.args => audio-alsa-minimal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-coreaudio-best.args => audio-coreaudio-best.x86_64-4.1.0.args} (81%) rename tests/qemuxml2argvdata/{audio-coreaudio-full.err => audio-coreaudio-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-coreaudio-minimal.args => audio-coreaudio-minimal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-default-nographics.args => audio-default-nographics.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-file-best.args => audio-file-best.x86_64-4.1.0.args} (81%) rename tests/qemuxml2argvdata/{audio-file-full.err => audio-file-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-file-minimal.args => audio-file-minimal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-jack-full.err => audio-jack-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-jack-minimal.err => audio-jack-minimal.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-many-backends.err => audio-many-backends.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-none-best.args => audio-none-best.x86_64-4.1.0.args} (80%) rename tests/qemuxml2argvdata/{audio-none-full.err => audio-none-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-none-minimal.args => audio-none-minimal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-oss-best.args => audio-oss-best.x86_64-4.1.0.args} (82%) rename tests/qemuxml2argvdata/{audio-oss-full.err => audio-oss-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-oss-minimal.args => audio-oss-minimal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-pulseaudio-best.args => audio-pulseaudio-best.x86_64-4.1.0.args} (82%) rename tests/qemuxml2argvdata/{audio-pulseaudio-full.err => audio-pulseaudio-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-pulseaudio-minimal.args => audio-pulseaudio-minimal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-sdl-best.args => audio-sdl-best.x86_64-4.1.0.args} (81%) rename tests/qemuxml2argvdata/{audio-sdl-full.err => audio-sdl-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-sdl-minimal.args => audio-sdl-minimal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-spice-best.args => audio-spice-best.x86_64-4.1.0.args} (80%) rename tests/qemuxml2argvdata/{audio-spice-full.err => audio-spice-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-spice-minimal.args => audio-spice-minimal.x86_64-4.1.0.args} (75%) diff --git a/tests/qemuxml2argvdata/audio-alsa-best.args b/tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args similarity index 81% rename from tests/qemuxml2argvdata/audio-alsa-best.args rename to tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args index a9c6833570..615a45711e 100644 --- a/tests/qemuxml2argvdata/audio-alsa-best.args +++ b/tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args @@ -24,21 +24,22 @@ QEMU_AUDIO_DAC_DEV=/dev/dsp1 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/audio-alsa-full.err b/tests/qemuxml2argvdata/audio-alsa-full.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-alsa-full.err rename to tests/qemuxml2argvdata/audio-alsa-full.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-alsa-minimal.args b/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args similarity index 75% rename from tests/qemuxml2argvdata/audio-alsa-minimal.args rename to tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args index 9a1126b0e8..d27ddd1e29 100644 --- a/tests/qemuxml2argvdata/audio-alsa-minimal.args +++ b/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args @@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=alsa \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/audio-coreaudio-best.args b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args similarity index 81% rename from tests/qemuxml2argvdata/audio-coreaudio-best.args rename to tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args index 60308f06f0..cdcec548ea 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-best.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args @@ -24,21 +24,22 @@ QEMU_COREAUDIO_BUFFER_SIZE=200 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/audio-coreaudio-full.err b/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-coreaudio-full.err rename to tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-coreaudio-minimal.args b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args similarity index 75% rename from tests/qemuxml2argvdata/audio-coreaudio-minimal.args rename to tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args index f5a1c9822a..2254f91106 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-minimal.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args @@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=coreaudio \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/audio-default-nographics.args b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args similarity index 75% rename from tests/qemuxml2argvdata/audio-default-nographics.args rename to tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args index 9a1126b0e8..d27ddd1e29 100644 --- a/tests/qemuxml2argvdata/audio-default-nographics.args +++ b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args @@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=alsa \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/audio-file-best.args b/tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args similarity index 81% rename from tests/qemuxml2argvdata/audio-file-best.args rename to tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args index 36bd22e223..ccdc6417ab 100644 --- a/tests/qemuxml2argvdata/audio-file-best.args +++ b/tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args @@ -23,21 +23,22 @@ QEMU_WAV_PATH=audio.wav \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/audio-file-full.err b/tests/qemuxml2argvdata/audio-file-full.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-file-full.err rename to tests/qemuxml2argvdata/audio-file-full.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-file-minimal.args b/tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args similarity index 75% rename from tests/qemuxml2argvdata/audio-file-minimal.args rename to tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args index abb377fab3..69f6f07a7c 100644 --- a/tests/qemuxml2argvdata/audio-file-minimal.args +++ b/tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args @@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=wav \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/audio-jack-full.err b/tests/qemuxml2argvdata/audio-jack-full.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-jack-full.err rename to tests/qemuxml2argvdata/audio-jack-full.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-jack-minimal.err b/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-jack-minimal.err rename to tests/qemuxml2argvdata/audio-jack-minimal.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-many-backends.err b/tests/qemuxml2argvdata/audio-many-backends.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-many-backends.err rename to tests/qemuxml2argvdata/audio-many-backends.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-none-best.args b/tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args similarity index 80% rename from tests/qemuxml2argvdata/audio-none-best.args rename to tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args index 8284b7cf5f..06bca09a59 100644 --- a/tests/qemuxml2argvdata/audio-none-best.args +++ b/tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args @@ -22,21 +22,22 @@ QEMU_AUDIO_DAC_FIXED_FMT=f32 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/audio-none-full.err b/tests/qemuxml2argvdata/audio-none-full.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-none-full.err rename to tests/qemuxml2argvdata/audio-none-full.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-none-minimal.args b/tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args similarity index 75% rename from tests/qemuxml2argvdata/audio-none-minimal.args rename to tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args index ec6ddd2857..0624595a5e 100644 --- a/tests/qemuxml2argvdata/audio-none-minimal.args +++ b/tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args @@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/audio-oss-best.args b/tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args similarity index 82% rename from tests/qemuxml2argvdata/audio-oss-best.args rename to tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args index 25d37650f6..99ef339f50 100644 --- a/tests/qemuxml2argvdata/audio-oss-best.args +++ b/tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args @@ -27,21 +27,22 @@ QEMU_OSS_NFRAGS=30 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/audio-oss-full.err b/tests/qemuxml2argvdata/audio-oss-full.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-oss-full.err rename to tests/qemuxml2argvdata/audio-oss-full.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-oss-minimal.args b/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args similarity index 75% rename from tests/qemuxml2argvdata/audio-oss-minimal.args rename to tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args index eb94dedbe0..19870c0d84 100644 --- a/tests/qemuxml2argvdata/audio-oss-minimal.args +++ b/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args @@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=oss \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-best.args b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args similarity index 82% rename from tests/qemuxml2argvdata/audio-pulseaudio-best.args rename to tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args index f462325694..3f6118e847 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-best.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args @@ -26,21 +26,22 @@ QEMU_PA_SERVER=%s=acme.example.org \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-full.err b/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-pulseaudio-full.err rename to tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.args b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args similarity index 75% rename from tests/qemuxml2argvdata/audio-pulseaudio-minimal.args rename to tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args index e68b58528d..e6c8a71925 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args @@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=pa \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/audio-sdl-best.args b/tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args similarity index 81% rename from tests/qemuxml2argvdata/audio-sdl-best.args rename to tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args index 221d67468c..2767721b6b 100644 --- a/tests/qemuxml2argvdata/audio-sdl-best.args +++ b/tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args @@ -24,21 +24,22 @@ SDL_AUDIODRIVER=pulseaudio \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/audio-sdl-full.err b/tests/qemuxml2argvdata/audio-sdl-full.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-sdl-full.err rename to tests/qemuxml2argvdata/audio-sdl-full.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-sdl-minimal.args b/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args similarity index 75% rename from tests/qemuxml2argvdata/audio-sdl-minimal.args rename to tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args index fe745b25db..6720a3b50a 100644 --- a/tests/qemuxml2argvdata/audio-sdl-minimal.args +++ b/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args @@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=sdl \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/audio-spice-best.args b/tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args similarity index 80% rename from tests/qemuxml2argvdata/audio-spice-best.args rename to tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args index 70d10fe24d..bfc9657ae6 100644 --- a/tests/qemuxml2argvdata/audio-spice-best.args +++ b/tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args @@ -22,21 +22,22 @@ QEMU_AUDIO_DAC_FIXED_FMT=f32 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/audio-spice-full.err b/tests/qemuxml2argvdata/audio-spice-full.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-spice-full.err rename to tests/qemuxml2argvdata/audio-spice-full.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-spice-minimal.args b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args similarity index 75% rename from tests/qemuxml2argvdata/audio-spice-minimal.args rename to tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args index 30a4f5e5a0..ebc58f725b 100644 --- a/tests/qemuxml2argvdata/audio-spice-minimal.args +++ b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args @@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=spice \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 69018c6411..87c8a27b73 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1080,15 +1080,15 @@ mymain(void) QEMU_CAPS_VIRTIO_BLK_SCSI); /* Simplest possible <audio>, all supported with ENV */ - DO_TEST_NOCAPS("audio-none-minimal"); - DO_TEST_NOCAPS("audio-alsa-minimal"); - DO_TEST_NOCAPS("audio-coreaudio-minimal"); - DO_TEST_PARSE_ERROR_NOCAPS("audio-jack-minimal"); - DO_TEST_NOCAPS("audio-oss-minimal"); - DO_TEST_NOCAPS("audio-pulseaudio-minimal"); - DO_TEST_NOCAPS("audio-sdl-minimal"); - DO_TEST_NOCAPS("audio-spice-minimal"); - DO_TEST_NOCAPS("audio-file-minimal"); + DO_TEST_CAPS_VER("audio-none-minimal", "4.1.0"); + DO_TEST_CAPS_VER("audio-alsa-minimal", "4.1.0"); + DO_TEST_CAPS_VER("audio-coreaudio-minimal", "4.1.0"); + DO_TEST_CAPS_VER_PARSE_ERROR("audio-jack-minimal", "4.1.0"); + DO_TEST_CAPS_VER("audio-oss-minimal", "4.1.0"); + DO_TEST_CAPS_VER("audio-pulseaudio-minimal", "4.1.0"); + DO_TEST_CAPS_VER("audio-sdl-minimal", "4.1.0"); + DO_TEST_CAPS_VER("audio-spice-minimal", "4.1.0"); + DO_TEST_CAPS_VER("audio-file-minimal", "4.1.0"); DO_TEST_CAPS_LATEST("audio-none-minimal"); DO_TEST_CAPS_LATEST("audio-alsa-minimal"); @@ -1101,14 +1101,14 @@ mymain(void) DO_TEST_CAPS_LATEST("audio-file-minimal"); /* Best <audio> still compat with old ENV */ - DO_TEST_NOCAPS("audio-none-best"); - DO_TEST_NOCAPS("audio-alsa-best"); - DO_TEST_NOCAPS("audio-coreaudio-best"); - DO_TEST_NOCAPS("audio-oss-best"); - DO_TEST_NOCAPS("audio-pulseaudio-best"); - DO_TEST_NOCAPS("audio-sdl-best"); - DO_TEST_NOCAPS("audio-spice-best"); - DO_TEST_NOCAPS("audio-file-best"); + DO_TEST_CAPS_VER("audio-none-best", "4.1.0"); + DO_TEST_CAPS_VER("audio-alsa-best", "4.1.0"); + DO_TEST_CAPS_VER("audio-coreaudio-best", "4.1.0"); + DO_TEST_CAPS_VER("audio-oss-best", "4.1.0"); + DO_TEST_CAPS_VER("audio-pulseaudio-best", "4.1.0"); + DO_TEST_CAPS_VER("audio-sdl-best", "4.1.0"); + DO_TEST_CAPS_VER("audio-spice-best", "4.1.0"); + DO_TEST_CAPS_VER("audio-file-best", "4.1.0"); DO_TEST_CAPS_LATEST("audio-none-best"); DO_TEST_CAPS_LATEST("audio-alsa-best"); @@ -1120,15 +1120,15 @@ mymain(void) DO_TEST_CAPS_LATEST("audio-file-best"); /* Full <audio> only compat with new QEMU -audiodev args */ - DO_TEST_PARSE_ERROR_NOCAPS("audio-none-full"); - DO_TEST_PARSE_ERROR_NOCAPS("audio-alsa-full"); - DO_TEST_PARSE_ERROR_NOCAPS("audio-coreaudio-full"); - DO_TEST_PARSE_ERROR_NOCAPS("audio-jack-full"); - DO_TEST_PARSE_ERROR_NOCAPS("audio-oss-full"); - DO_TEST_PARSE_ERROR_NOCAPS("audio-pulseaudio-full"); - DO_TEST_PARSE_ERROR_NOCAPS("audio-sdl-full"); - DO_TEST_PARSE_ERROR_NOCAPS("audio-spice-full"); - DO_TEST_PARSE_ERROR_NOCAPS("audio-file-full"); + DO_TEST_CAPS_VER_PARSE_ERROR("audio-none-full", "4.1.0"); + DO_TEST_CAPS_VER_PARSE_ERROR("audio-alsa-full", "4.1.0"); + DO_TEST_CAPS_VER_PARSE_ERROR("audio-coreaudio-full", "4.1.0"); + DO_TEST_CAPS_VER_PARSE_ERROR("audio-jack-full", "4.1.0"); + DO_TEST_CAPS_VER_PARSE_ERROR("audio-oss-full", "4.1.0"); + DO_TEST_CAPS_VER_PARSE_ERROR("audio-pulseaudio-full", "4.1.0"); + DO_TEST_CAPS_VER_PARSE_ERROR("audio-sdl-full", "4.1.0"); + DO_TEST_CAPS_VER_PARSE_ERROR("audio-spice-full", "4.1.0"); + DO_TEST_CAPS_VER_PARSE_ERROR("audio-file-full", "4.1.0"); DO_TEST_CAPS_LATEST("audio-none-full"); DO_TEST_CAPS_LATEST("audio-alsa-full"); @@ -1141,7 +1141,7 @@ mymain(void) DO_TEST_CAPS_LATEST("audio-file-full"); /* Multiple backends not supported with ENV */ - DO_TEST_PARSE_ERROR_NOCAPS("audio-many-backends"); + DO_TEST_CAPS_VER_PARSE_ERROR("audio-many-backends", "4.1.0"); DO_TEST_CAPS_LATEST("audio-many-backends"); /* Validate auto-creation of <audio> for legacy compat */ @@ -1164,7 +1164,7 @@ mymain(void) g_setenv("QEMU_AUDIO_DRV", "alsa", TRUE); driver.config->nogfxAllowHostAudio = true; - DO_TEST_NOCAPS("audio-default-nographics"); + DO_TEST_CAPS_VER("audio-default-nographics", "4.1.0"); DO_TEST_CAPS_LATEST("audio-default-nographics"); driver.config->nogfxAllowHostAudio = false; g_unsetenv("QEMU_AUDIO_DRV"); -- 2.31.1