qemuxml2argvtest: Drop 'qemu-4.1' variants of all audio tests

Minimum qemu version will be bumped to qemu-4.2 so we no longer need to
care about configuring audiodevs via the environment variables.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args
deleted file mode 100644 (file)
index a25b57c..0000000
--- a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args
+++ /dev/null
@@ -1,46 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=alsa \
-QEMU_AUDIO_TIMER_PERIOD=50 \
-QEMU_AUDIO_ADC_FIXED_SETTINGS=on \
-QEMU_AUDIO_ADC_VOICES=1 \
-QEMU_AUDIO_ADC_FIXED_FREQ=44100 \
-QEMU_AUDIO_ADC_FIXED_CHANNELS=2 \
-QEMU_AUDIO_ADC_FIXED_FMT=s16 \
-QEMU_AUDIO_DAC_FIXED_SETTINGS=on \
-QEMU_AUDIO_DAC_VOICES=2 \
-QEMU_AUDIO_DAC_FIXED_FREQ=22050 \
-QEMU_AUDIO_DAC_FIXED_CHANNELS=4 \
-QEMU_AUDIO_DAC_FIXED_FMT=f32 \
-QEMU_AUDIO_ADC_DEV=/dev/dsp0 \
-QEMU_AUDIO_DAC_DEV=/dev/dsp1 \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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.x86_64-4.1.0.err b/tests/qemuxml2argvdata/audio-alsa-full.x86_64-4.1.0.err
deleted file mode 100644 (file)
index d9ceac7..0000000
--- a/tests/qemuxml2argvdata/audio-alsa-full.x86_64-4.1.0.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: setting audio buffer length is not supported with this QEMU

diff --git a/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args
deleted file mode 100644 (file)
index 080abdc..0000000
--- a/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=alsa \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args
deleted file mode 100644 (file)
index cd43f8c..0000000
--- a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args
+++ /dev/null
@@ -1,46 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=coreaudio \
-QEMU_AUDIO_TIMER_PERIOD=50 \
-QEMU_AUDIO_ADC_FIXED_SETTINGS=on \
-QEMU_AUDIO_ADC_VOICES=1 \
-QEMU_AUDIO_ADC_FIXED_FREQ=44100 \
-QEMU_AUDIO_ADC_FIXED_CHANNELS=2 \
-QEMU_AUDIO_ADC_FIXED_FMT=s16 \
-QEMU_AUDIO_DAC_FIXED_SETTINGS=on \
-QEMU_AUDIO_DAC_VOICES=2 \
-QEMU_AUDIO_DAC_FIXED_FREQ=22050 \
-QEMU_AUDIO_DAC_FIXED_CHANNELS=4 \
-QEMU_AUDIO_DAC_FIXED_FMT=f32 \
-QEMU_COREAUDIO_BUFFER_COUNT=42 \
-QEMU_COREAUDIO_BUFFER_SIZE=200 \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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.x86_64-4.1.0.err b/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-4.1.0.err
deleted file mode 100644 (file)
index d9ceac7..0000000
--- a/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-4.1.0.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: setting audio buffer length is not supported with this QEMU

diff --git a/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args
deleted file mode 100644 (file)
index 69172e8..0000000
--- a/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=coreaudio \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args
deleted file mode 100644 (file)
index 080abdc..0000000
--- a/tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=alsa \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args
deleted file mode 100644 (file)
index 7cde695..0000000
--- a/tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args
+++ /dev/null
@@ -1,45 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=wav \
-QEMU_AUDIO_TIMER_PERIOD=50 \
-QEMU_AUDIO_ADC_FIXED_SETTINGS=on \
-QEMU_AUDIO_ADC_VOICES=1 \
-QEMU_AUDIO_ADC_FIXED_FREQ=44100 \
-QEMU_AUDIO_ADC_FIXED_CHANNELS=2 \
-QEMU_AUDIO_ADC_FIXED_FMT=s16 \
-QEMU_AUDIO_DAC_FIXED_SETTINGS=on \
-QEMU_AUDIO_DAC_VOICES=2 \
-QEMU_AUDIO_DAC_FIXED_FREQ=22050 \
-QEMU_AUDIO_DAC_FIXED_CHANNELS=4 \
-QEMU_AUDIO_DAC_FIXED_FMT=f32 \
-QEMU_WAV_PATH=audio.wav \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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.x86_64-4.1.0.err b/tests/qemuxml2argvdata/audio-file-full.x86_64-4.1.0.err
deleted file mode 100644 (file)
index d9ceac7..0000000
--- a/tests/qemuxml2argvdata/audio-file-full.x86_64-4.1.0.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: setting audio buffer length is not supported with this QEMU

diff --git a/tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args
deleted file mode 100644 (file)
index 2d426b9..0000000
--- a/tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=wav \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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.x86_64-4.1.0.err b/tests/qemuxml2argvdata/audio-jack-full.x86_64-4.1.0.err
deleted file mode 100644 (file)
index d9ceac7..0000000
--- a/tests/qemuxml2argvdata/audio-jack-full.x86_64-4.1.0.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: setting audio buffer length is not supported with this QEMU

diff --git a/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-4.1.0.err b/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-4.1.0.err
deleted file mode 100644 (file)
index 0747113..0000000
--- a/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-4.1.0.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: 'jack' audio backend is not supported with this QEMU

diff --git a/tests/qemuxml2argvdata/audio-many-backends.x86_64-4.1.0.err b/tests/qemuxml2argvdata/audio-many-backends.x86_64-4.1.0.err
deleted file mode 100644 (file)
index 19b69e8..0000000
--- a/tests/qemuxml2argvdata/audio-many-backends.x86_64-4.1.0.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: only one audio backend is supported with this QEMU binary

diff --git a/tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args
deleted file mode 100644 (file)
index 12a85c4..0000000
--- a/tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args
+++ /dev/null
@@ -1,44 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-QEMU_AUDIO_TIMER_PERIOD=50 \
-QEMU_AUDIO_ADC_FIXED_SETTINGS=on \
-QEMU_AUDIO_ADC_VOICES=1 \
-QEMU_AUDIO_ADC_FIXED_FREQ=44100 \
-QEMU_AUDIO_ADC_FIXED_CHANNELS=2 \
-QEMU_AUDIO_ADC_FIXED_FMT=s16 \
-QEMU_AUDIO_DAC_FIXED_SETTINGS=on \
-QEMU_AUDIO_DAC_VOICES=2 \
-QEMU_AUDIO_DAC_FIXED_FREQ=22050 \
-QEMU_AUDIO_DAC_FIXED_CHANNELS=4 \
-QEMU_AUDIO_DAC_FIXED_FMT=f32 \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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.x86_64-4.1.0.err b/tests/qemuxml2argvdata/audio-none-full.x86_64-4.1.0.err
deleted file mode 100644 (file)
index d9ceac7..0000000
--- a/tests/qemuxml2argvdata/audio-none-full.x86_64-4.1.0.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: setting audio buffer length is not supported with this QEMU

diff --git a/tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args
deleted file mode 100644 (file)
index 15f3290..0000000
--- a/tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args
deleted file mode 100644 (file)
index 28a02ce..0000000
--- a/tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args
+++ /dev/null
@@ -1,49 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=oss \
-QEMU_AUDIO_TIMER_PERIOD=50 \
-QEMU_AUDIO_ADC_FIXED_SETTINGS=on \
-QEMU_AUDIO_ADC_VOICES=1 \
-QEMU_AUDIO_ADC_FIXED_FREQ=44100 \
-QEMU_AUDIO_ADC_FIXED_CHANNELS=2 \
-QEMU_AUDIO_ADC_FIXED_FMT=s16 \
-QEMU_AUDIO_DAC_FIXED_SETTINGS=on \
-QEMU_AUDIO_DAC_VOICES=2 \
-QEMU_AUDIO_DAC_FIXED_FREQ=22050 \
-QEMU_AUDIO_DAC_FIXED_CHANNELS=4 \
-QEMU_AUDIO_DAC_FIXED_FMT=f32 \
-QEMU_OSS_ADC_DEV=/dev/dsp0 \
-QEMU_AUDIO_ADC_TRY_POLL=on \
-QEMU_OSS_DAC_DEV=/dev/dsp1 \
-QEMU_AUDIO_DAC_TRY_POLL=off \
-QEMU_OSS_NFRAGS=30 \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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.x86_64-4.1.0.err b/tests/qemuxml2argvdata/audio-oss-full.x86_64-4.1.0.err
deleted file mode 100644 (file)
index d9ceac7..0000000
--- a/tests/qemuxml2argvdata/audio-oss-full.x86_64-4.1.0.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: setting audio buffer length is not supported with this QEMU

diff --git a/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args
deleted file mode 100644 (file)
index 9f06244..0000000
--- a/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=oss \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args
deleted file mode 100644 (file)
index d20d734..0000000
--- a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args
+++ /dev/null
@@ -1,48 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=pa \
-QEMU_AUDIO_TIMER_PERIOD=50 \
-QEMU_AUDIO_ADC_FIXED_SETTINGS=on \
-QEMU_AUDIO_ADC_VOICES=1 \
-QEMU_AUDIO_ADC_FIXED_FREQ=44100 \
-QEMU_AUDIO_ADC_FIXED_CHANNELS=2 \
-QEMU_AUDIO_ADC_FIXED_FMT=s16 \
-QEMU_AUDIO_DAC_FIXED_SETTINGS=on \
-QEMU_AUDIO_DAC_VOICES=2 \
-QEMU_AUDIO_DAC_FIXED_FREQ=22050 \
-QEMU_AUDIO_DAC_FIXED_CHANNELS=4 \
-QEMU_AUDIO_DAC_FIXED_FMT=f32 \
-QEMU_PA_SOURCE=fish \
-QEMU_PA_SINK=fish \
-QEMU_PA_SAMPLES=200 \
-QEMU_PA_SERVER=%s=acme.example.org \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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.x86_64-4.1.0.err b/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-4.1.0.err
deleted file mode 100644 (file)
index 27eaa44..0000000
--- a/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-4.1.0.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: setting audio stream name is not supported with this QEMU

diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args
deleted file mode 100644 (file)
index 379310c..0000000
--- a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=pa \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args
deleted file mode 100644 (file)
index 40b3004..0000000
--- a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args
+++ /dev/null
@@ -1,46 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=sdl \
-QEMU_AUDIO_TIMER_PERIOD=50 \
-QEMU_AUDIO_ADC_FIXED_SETTINGS=on \
-QEMU_AUDIO_ADC_VOICES=1 \
-QEMU_AUDIO_ADC_FIXED_FREQ=44100 \
-QEMU_AUDIO_ADC_FIXED_CHANNELS=2 \
-QEMU_AUDIO_ADC_FIXED_FMT=s16 \
-QEMU_AUDIO_DAC_FIXED_SETTINGS=on \
-QEMU_AUDIO_DAC_VOICES=2 \
-QEMU_AUDIO_DAC_FIXED_FREQ=22050 \
-QEMU_AUDIO_DAC_FIXED_CHANNELS=4 \
-QEMU_AUDIO_DAC_FIXED_FMT=f32 \
-QEMU_SDL_SAMPLES=200 \
-SDL_AUDIODRIVER=pulseaudio \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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.x86_64-4.1.0.err b/tests/qemuxml2argvdata/audio-sdl-full.x86_64-4.1.0.err
deleted file mode 100644 (file)
index d9ceac7..0000000
--- a/tests/qemuxml2argvdata/audio-sdl-full.x86_64-4.1.0.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: setting audio buffer length is not supported with this QEMU

diff --git a/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args
deleted file mode 100644 (file)
index 4bf332d..0000000
--- a/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=sdl \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args
deleted file mode 100644 (file)
index ca1d3ac..0000000
--- a/tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args
+++ /dev/null
@@ -1,45 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=spice \
-QEMU_AUDIO_TIMER_PERIOD=50 \
-QEMU_AUDIO_ADC_FIXED_SETTINGS=on \
-QEMU_AUDIO_ADC_VOICES=1 \
-QEMU_AUDIO_ADC_FIXED_FREQ=44100 \
-QEMU_AUDIO_ADC_FIXED_CHANNELS=2 \
-QEMU_AUDIO_ADC_FIXED_FMT=s16 \
-QEMU_AUDIO_DAC_FIXED_SETTINGS=on \
-QEMU_AUDIO_DAC_VOICES=2 \
-QEMU_AUDIO_DAC_FIXED_FREQ=22050 \
-QEMU_AUDIO_DAC_FIXED_CHANNELS=4 \
-QEMU_AUDIO_DAC_FIXED_FMT=f32 \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--no-user-config \
--nodefaults \
--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 \
--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 \
--spice port=0,seamless-migration=on \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on

diff --git a/tests/qemuxml2argvdata/audio-spice-full.x86_64-4.1.0.err b/tests/qemuxml2argvdata/audio-spice-full.x86_64-4.1.0.err
deleted file mode 100644 (file)
index d9ceac7..0000000
--- a/tests/qemuxml2argvdata/audio-spice-full.x86_64-4.1.0.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: setting audio buffer length is not supported with this QEMU

diff --git a/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args
deleted file mode 100644 (file)
index 0a11d70..0000000
--- a/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--no-user-config \
--nodefaults \
--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 \
--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 \
--spice port=0,seamless-migration=on \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 5c6a543d28011a152ff1fe185e7becf251d409ee..2b0a8518cfed4b1b098b5b740c6e6d9861b1c63a 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1094,17 +1094,6 @@ mymain(void)
     DO_TEST("boot-complex",
             QEMU_CAPS_VIRTIO_BLK_SCSI);
 
-    /* Simplest possible <audio>, all supported with ENV */
-    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");
     DO_TEST_CAPS_LATEST("audio-coreaudio-minimal");
@@ -1115,16 +1104,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("audio-spice-minimal");
     DO_TEST_CAPS_LATEST("audio-file-minimal");
 
-    /* Best <audio> still compat with old ENV */
-    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");
     DO_TEST_CAPS_LATEST("audio-coreaudio-best");
@@ -1134,17 +1113,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("audio-spice-best");
     DO_TEST_CAPS_LATEST("audio-file-best");
 
-    /* Full <audio> only compat with new QEMU -audiodev args */
-    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");
     DO_TEST_CAPS_LATEST("audio-coreaudio-full");
@@ -1155,8 +1123,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("audio-spice-full");
     DO_TEST_CAPS_LATEST("audio-file-full");
 
-    /* Multiple backends not supported with ENV */
-    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 */
@@ -1179,7 +1145,6 @@ mymain(void)
 
     g_setenv("QEMU_AUDIO_DRV", "alsa", TRUE);
     driver.config->nogfxAllowHostAudio = true;
-    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");