[PATCH 0/3] Audio test cleanups
Few things I've cleaned up before realizing that: https://gitlab.com/libvirt/libvirt/-/issues/473 can't really be solved without qemu assistance. Peter Krempa (3): qemuxml2xmlout: Replace symlinks of all 'audio-' tests by real files qemuxml2argvtest: Use real caps instead of fake caps for 'audio-default-*' cases qemuxml2xmltest: Modernize all 'audio-' cases ...gs => audio-default-sdl.x86_64-4.2.0.args} | 6 +- ... => audio-default-spice.x86_64-4.2.0.args} | 6 +- ...gs => audio-default-vnc.x86_64-4.2.0.args} | 6 +- tests/qemuxml2argvtest.c | 6 +- .../audio-alsa-best.x86_64-latest.xml | 46 ++++++++++++++ tests/qemuxml2xmloutdata/audio-alsa-best.xml | 1 - .../audio-alsa-full.x86_64-latest.xml | 46 ++++++++++++++ tests/qemuxml2xmloutdata/audio-alsa-full.xml | 1 - .../audio-alsa-minimal.x86_64-latest.xml | 39 ++++++++++++ .../qemuxml2xmloutdata/audio-alsa-minimal.xml | 1 - .../audio-coreaudio-best.x86_64-latest.xml | 46 ++++++++++++++ .../audio-coreaudio-best.xml | 1 - .../audio-coreaudio-full.x86_64-latest.xml | 46 ++++++++++++++ .../audio-coreaudio-full.xml | 1 - .../audio-coreaudio-minimal.x86_64-latest.xml | 39 ++++++++++++ .../audio-coreaudio-minimal.xml | 1 - .../audio-file-best.x86_64-latest.xml | 46 ++++++++++++++ tests/qemuxml2xmloutdata/audio-file-best.xml | 1 - .../audio-file-full.x86_64-latest.xml | 46 ++++++++++++++ tests/qemuxml2xmloutdata/audio-file-full.xml | 1 - .../audio-file-minimal.x86_64-latest.xml | 39 ++++++++++++ .../qemuxml2xmloutdata/audio-file-minimal.xml | 1 - .../audio-jack-full.x86_64-latest.xml | 46 ++++++++++++++ tests/qemuxml2xmloutdata/audio-jack-full.xml | 1 - .../audio-many-backends.x86_64-latest.xml | 61 ++++++++++++++++++- .../audio-none-best.x86_64-latest.xml | 46 ++++++++++++++ tests/qemuxml2xmloutdata/audio-none-best.xml | 1 - .../audio-none-full.x86_64-latest.xml | 46 ++++++++++++++ tests/qemuxml2xmloutdata/audio-none-full.xml | 1 - .../audio-none-minimal.x86_64-latest.xml | 39 ++++++++++++ .../qemuxml2xmloutdata/audio-none-minimal.xml | 1 - .../audio-oss-best.x86_64-latest.xml | 46 ++++++++++++++ tests/qemuxml2xmloutdata/audio-oss-best.xml | 1 - .../audio-oss-full.x86_64-latest.xml | 46 ++++++++++++++ tests/qemuxml2xmloutdata/audio-oss-full.xml | 1 - .../audio-oss-minimal.x86_64-latest.xml | 39 ++++++++++++ .../qemuxml2xmloutdata/audio-oss-minimal.xml | 1 - .../audio-pulseaudio-best.x86_64-latest.xml | 46 ++++++++++++++ .../audio-pulseaudio-best.xml | 1 - .../audio-pulseaudio-full.x86_64-latest.xml | 46 ++++++++++++++ .../audio-pulseaudio-full.xml | 1 - ...audio-pulseaudio-minimal.x86_64-latest.xml | 39 ++++++++++++ .../audio-pulseaudio-minimal.xml | 1 - .../audio-sdl-best.x86_64-latest.xml | 46 ++++++++++++++ tests/qemuxml2xmloutdata/audio-sdl-best.xml | 1 - .../audio-sdl-full.x86_64-latest.xml | 46 ++++++++++++++ tests/qemuxml2xmloutdata/audio-sdl-full.xml | 1 - .../audio-sdl-minimal.x86_64-latest.xml | 39 ++++++++++++ .../qemuxml2xmloutdata/audio-sdl-minimal.xml | 1 - .../audio-spice-best.x86_64-latest.xml | 53 ++++++++++++++++ tests/qemuxml2xmloutdata/audio-spice-best.xml | 1 - .../audio-spice-full.x86_64-latest.xml | 53 ++++++++++++++++ tests/qemuxml2xmloutdata/audio-spice-full.xml | 1 - .../audio-spice-minimal.x86_64-latest.xml | 46 ++++++++++++++ .../audio-spice-minimal.xml | 1 - tests/qemuxml2xmltest.c | 56 ++++++++--------- 56 files changed, 1215 insertions(+), 66 deletions(-) rename tests/qemuxml2argvdata/{audio-default-sdl.args => audio-default-sdl.x86_64-4.2.0.args} (86%) rename tests/qemuxml2argvdata/{audio-default-spice.args => audio-default-spice.x86_64-4.2.0.args} (86%) rename tests/qemuxml2argvdata/{audio-default-vnc.args => audio-default-vnc.x86_64-4.2.0.args} (86%) create mode 100644 tests/qemuxml2xmloutdata/audio-alsa-best.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-alsa-best.xml create mode 100644 tests/qemuxml2xmloutdata/audio-alsa-full.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-alsa-full.xml create mode 100644 tests/qemuxml2xmloutdata/audio-alsa-minimal.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-alsa-minimal.xml create mode 100644 tests/qemuxml2xmloutdata/audio-coreaudio-best.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-coreaudio-best.xml create mode 100644 tests/qemuxml2xmloutdata/audio-coreaudio-full.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-coreaudio-full.xml create mode 100644 tests/qemuxml2xmloutdata/audio-coreaudio-minimal.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml create mode 100644 tests/qemuxml2xmloutdata/audio-file-best.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-file-best.xml create mode 100644 tests/qemuxml2xmloutdata/audio-file-full.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-file-full.xml create mode 100644 tests/qemuxml2xmloutdata/audio-file-minimal.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-file-minimal.xml create mode 100644 tests/qemuxml2xmloutdata/audio-jack-full.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-jack-full.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-many-backends.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/audio-none-best.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-none-best.xml create mode 100644 tests/qemuxml2xmloutdata/audio-none-full.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-none-full.xml create mode 100644 tests/qemuxml2xmloutdata/audio-none-minimal.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-none-minimal.xml create mode 100644 tests/qemuxml2xmloutdata/audio-oss-best.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-oss-best.xml create mode 100644 tests/qemuxml2xmloutdata/audio-oss-full.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-oss-full.xml create mode 100644 tests/qemuxml2xmloutdata/audio-oss-minimal.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-oss-minimal.xml create mode 100644 tests/qemuxml2xmloutdata/audio-pulseaudio-best.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml create mode 100644 tests/qemuxml2xmloutdata/audio-pulseaudio-full.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml create mode 100644 tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml create mode 100644 tests/qemuxml2xmloutdata/audio-sdl-best.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-sdl-best.xml create mode 100644 tests/qemuxml2xmloutdata/audio-sdl-full.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-sdl-full.xml create mode 100644 tests/qemuxml2xmloutdata/audio-sdl-minimal.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-sdl-minimal.xml create mode 100644 tests/qemuxml2xmloutdata/audio-spice-best.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-spice-best.xml create mode 100644 tests/qemuxml2xmloutdata/audio-spice-full.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-spice-full.xml create mode 100644 tests/qemuxml2xmloutdata/audio-spice-minimal.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/audio-spice-minimal.xml -- 2.40.1
Symlinks are hard to maintain and especially un-cool when attempting to test against real capapbilities. Replace symlinks by real files first so that we can switch to real caps and see the difference. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2xmloutdata/audio-alsa-best.xml | 44 ++++++++++++- tests/qemuxml2xmloutdata/audio-alsa-full.xml | 44 ++++++++++++- .../qemuxml2xmloutdata/audio-alsa-minimal.xml | 37 ++++++++++- .../audio-coreaudio-best.xml | 44 ++++++++++++- .../audio-coreaudio-full.xml | 44 ++++++++++++- .../audio-coreaudio-minimal.xml | 37 ++++++++++- tests/qemuxml2xmloutdata/audio-file-best.xml | 44 ++++++++++++- tests/qemuxml2xmloutdata/audio-file-full.xml | 44 ++++++++++++- .../qemuxml2xmloutdata/audio-file-minimal.xml | 37 ++++++++++- tests/qemuxml2xmloutdata/audio-jack-full.xml | 44 ++++++++++++- .../audio-many-backends.x86_64-latest.xml | 61 ++++++++++++++++++- tests/qemuxml2xmloutdata/audio-none-best.xml | 44 ++++++++++++- tests/qemuxml2xmloutdata/audio-none-full.xml | 44 ++++++++++++- .../qemuxml2xmloutdata/audio-none-minimal.xml | 37 ++++++++++- tests/qemuxml2xmloutdata/audio-oss-best.xml | 44 ++++++++++++- tests/qemuxml2xmloutdata/audio-oss-full.xml | 44 ++++++++++++- .../qemuxml2xmloutdata/audio-oss-minimal.xml | 37 ++++++++++- .../audio-pulseaudio-best.xml | 44 ++++++++++++- .../audio-pulseaudio-full.xml | 44 ++++++++++++- .../audio-pulseaudio-minimal.xml | 37 ++++++++++- tests/qemuxml2xmloutdata/audio-sdl-best.xml | 44 ++++++++++++- tests/qemuxml2xmloutdata/audio-sdl-full.xml | 44 ++++++++++++- .../qemuxml2xmloutdata/audio-sdl-minimal.xml | 37 ++++++++++- tests/qemuxml2xmloutdata/audio-spice-best.xml | 51 +++++++++++++++- tests/qemuxml2xmloutdata/audio-spice-full.xml | 51 +++++++++++++++- .../audio-spice-minimal.xml | 44 ++++++++++++- 26 files changed, 1100 insertions(+), 26 deletions(-) mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-alsa-best.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-alsa-full.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-alsa-minimal.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-coreaudio-best.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-coreaudio-full.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-file-best.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-file-full.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-file-minimal.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-jack-full.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-many-backends.x86_64-latest.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-none-best.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-none-full.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-none-minimal.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-oss-best.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-oss-full.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-oss-minimal.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-sdl-best.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-sdl-full.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-sdl-minimal.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-spice-best.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-spice-full.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/audio-spice-minimal.xml diff --git a/tests/qemuxml2xmloutdata/audio-alsa-best.xml b/tests/qemuxml2xmloutdata/audio-alsa-best.xml deleted file mode 120000 index 2d0865c8ee..0000000000 --- a/tests/qemuxml2xmloutdata/audio-alsa-best.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-alsa-best.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-alsa-best.xml b/tests/qemuxml2xmloutdata/audio-alsa-best.xml new file mode 100644 index 0000000000..29283ab7d2 --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-alsa-best.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='alsa' timerPeriod='50'> + <input mixingEngine='yes' fixedSettings='yes' voices='1' dev='/dev/dsp0'> + <settings frequency='44100' channels='2' format='s16'/> + </input> + <output mixingEngine='yes' fixedSettings='yes' voices='2' dev='/dev/dsp1'> + <settings frequency='22050' channels='4' format='f32'/> + </output> + </audio> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-alsa-full.xml b/tests/qemuxml2xmloutdata/audio-alsa-full.xml deleted file mode 120000 index 61de7e7b33..0000000000 --- a/tests/qemuxml2xmloutdata/audio-alsa-full.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-alsa-full.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-alsa-full.xml b/tests/qemuxml2xmloutdata/audio-alsa-full.xml new file mode 100644 index 0000000000..4205ecde89 --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-alsa-full.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='alsa'> + <input mixingEngine='yes' fixedSettings='yes' voices='1' bufferLength='100' dev='/dev/dsp0'> + <settings frequency='44100' channels='2' format='s16'/> + </input> + <output mixingEngine='yes' fixedSettings='yes' voices='2' bufferLength='200' dev='/dev/dsp1'> + <settings frequency='22050' channels='4' format='f32'/> + </output> + </audio> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-alsa-minimal.xml b/tests/qemuxml2xmloutdata/audio-alsa-minimal.xml deleted file mode 120000 index c4f64da11f..0000000000 --- a/tests/qemuxml2xmloutdata/audio-alsa-minimal.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-alsa-minimal.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-alsa-minimal.xml b/tests/qemuxml2xmloutdata/audio-alsa-minimal.xml new file mode 100644 index 0000000000..57ff9d2bf0 --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-alsa-minimal.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='alsa'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-best.xml b/tests/qemuxml2xmloutdata/audio-coreaudio-best.xml deleted file mode 120000 index 13e96938d9..0000000000 --- a/tests/qemuxml2xmloutdata/audio-coreaudio-best.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-coreaudio-best.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-best.xml b/tests/qemuxml2xmloutdata/audio-coreaudio-best.xml new file mode 100644 index 0000000000..d171cc752f --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-coreaudio-best.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='coreaudio' timerPeriod='50'> + <input mixingEngine='yes' fixedSettings='yes' voices='1'> + <settings frequency='44100' channels='2' format='s16'/> + </input> + <output mixingEngine='yes' fixedSettings='yes' voices='2' bufferLength='200' bufferCount='42'> + <settings frequency='22050' channels='4' format='f32'/> + </output> + </audio> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-full.xml b/tests/qemuxml2xmloutdata/audio-coreaudio-full.xml deleted file mode 120000 index b00cc14e29..0000000000 --- a/tests/qemuxml2xmloutdata/audio-coreaudio-full.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-coreaudio-full.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-full.xml b/tests/qemuxml2xmloutdata/audio-coreaudio-full.xml new file mode 100644 index 0000000000..b6427a6e9f --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-coreaudio-full.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='coreaudio'> + <input mixingEngine='yes' fixedSettings='yes' voices='1' bufferLength='100' bufferCount='50'> + <settings frequency='44100' channels='2' format='s16'/> + </input> + <output mixingEngine='yes' fixedSettings='yes' voices='2' bufferLength='200' bufferCount='42'> + <settings frequency='22050' channels='4' format='f32'/> + </output> + </audio> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml b/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml deleted file mode 120000 index 3d3078850f..0000000000 --- a/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-coreaudio-minimal.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml b/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml new file mode 100644 index 0000000000..dac55ecbce --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='coreaudio'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-file-best.xml b/tests/qemuxml2xmloutdata/audio-file-best.xml deleted file mode 120000 index bb836545a0..0000000000 --- a/tests/qemuxml2xmloutdata/audio-file-best.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-file-best.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-file-best.xml b/tests/qemuxml2xmloutdata/audio-file-best.xml new file mode 100644 index 0000000000..9946ad9e3d --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-file-best.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='file' timerPeriod='50' path='audio.wav'> + <input mixingEngine='yes' fixedSettings='yes' voices='1'> + <settings frequency='44100' channels='2' format='s16'/> + </input> + <output mixingEngine='yes' fixedSettings='yes' voices='2'> + <settings frequency='22050' channels='4' format='f32'/> + </output> + </audio> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-file-full.xml b/tests/qemuxml2xmloutdata/audio-file-full.xml deleted file mode 120000 index 6e4b032b40..0000000000 --- a/tests/qemuxml2xmloutdata/audio-file-full.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-file-full.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-file-full.xml b/tests/qemuxml2xmloutdata/audio-file-full.xml new file mode 100644 index 0000000000..1e4c50f44a --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-file-full.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='file' path='audio.wav'> + <input mixingEngine='yes' fixedSettings='yes' voices='1' bufferLength='100'> + <settings frequency='44100' channels='2' format='s16'/> + </input> + <output mixingEngine='yes' fixedSettings='yes' voices='2' bufferLength='200'> + <settings frequency='22050' channels='4' format='f32'/> + </output> + </audio> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-file-minimal.xml b/tests/qemuxml2xmloutdata/audio-file-minimal.xml deleted file mode 120000 index 0b187008a6..0000000000 --- a/tests/qemuxml2xmloutdata/audio-file-minimal.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-file-minimal.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-file-minimal.xml b/tests/qemuxml2xmloutdata/audio-file-minimal.xml new file mode 100644 index 0000000000..65f2c56a90 --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-file-minimal.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='file'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-jack-full.xml b/tests/qemuxml2xmloutdata/audio-jack-full.xml deleted file mode 120000 index 813ccded71..0000000000 --- a/tests/qemuxml2xmloutdata/audio-jack-full.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-jack-full.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-jack-full.xml b/tests/qemuxml2xmloutdata/audio-jack-full.xml new file mode 100644 index 0000000000..0583a305b1 --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-jack-full.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='jack'> + <input mixingEngine='yes' fixedSettings='yes' voices='1' bufferLength='100' serverName='fish' clientName='food' connectPorts='yum'> + <settings frequency='44100' channels='2' format='s16'/> + </input> + <output mixingEngine='yes' fixedSettings='yes' voices='2' bufferLength='200' serverName='fish' clientName='food' connectPorts='yum'> + <settings frequency='22050' channels='4' format='f32'/> + </output> + </audio> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-many-backends.x86_64-latest.xml b/tests/qemuxml2xmloutdata/audio-many-backends.x86_64-latest.xml deleted file mode 120000 index 5f949f13e3..0000000000 --- a/tests/qemuxml2xmloutdata/audio-many-backends.x86_64-latest.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-many-backends.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-many-backends.x86_64-latest.xml b/tests/qemuxml2xmloutdata/audio-many-backends.x86_64-latest.xml new file mode 100644 index 0000000000..c681784526 --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-many-backends.x86_64-latest.xml @@ -0,0 +1,60 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes'> + <listen type='address'/> + <audio id='2'/> + </graphics> + <sound model='ac97'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </sound> + <sound model='ich6'> + <audio id='2'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </sound> + <sound model='es1370'> + <audio id='3'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </sound> + <audio id='1' type='none'/> + <audio id='2' type='alsa'/> + <audio id='3' type='pulseaudio'/> + <video> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-none-best.xml b/tests/qemuxml2xmloutdata/audio-none-best.xml deleted file mode 120000 index 7606228da6..0000000000 --- a/tests/qemuxml2xmloutdata/audio-none-best.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-none-best.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-none-best.xml b/tests/qemuxml2xmloutdata/audio-none-best.xml new file mode 100644 index 0000000000..98c3b17a84 --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-none-best.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none' timerPeriod='50'> + <input mixingEngine='yes' fixedSettings='yes' voices='1'> + <settings frequency='44100' channels='2' format='s16'/> + </input> + <output mixingEngine='yes' fixedSettings='yes' voices='2'> + <settings frequency='22050' channels='4' format='f32'/> + </output> + </audio> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-none-full.xml b/tests/qemuxml2xmloutdata/audio-none-full.xml deleted file mode 120000 index a5a7ec6932..0000000000 --- a/tests/qemuxml2xmloutdata/audio-none-full.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-none-full.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-none-full.xml b/tests/qemuxml2xmloutdata/audio-none-full.xml new file mode 100644 index 0000000000..85437c67f2 --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-none-full.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'> + <input mixingEngine='yes' fixedSettings='yes' voices='1' bufferLength='100'> + <settings frequency='44100' channels='2' format='s16'/> + </input> + <output mixingEngine='yes' fixedSettings='yes' voices='2' bufferLength='200'> + <settings frequency='22050' channels='4' format='f32'/> + </output> + </audio> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-none-minimal.xml b/tests/qemuxml2xmloutdata/audio-none-minimal.xml deleted file mode 120000 index ce0a93c3e4..0000000000 --- a/tests/qemuxml2xmloutdata/audio-none-minimal.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-none-minimal.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-none-minimal.xml b/tests/qemuxml2xmloutdata/audio-none-minimal.xml new file mode 100644 index 0000000000..4666777e56 --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-none-minimal.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-oss-best.xml b/tests/qemuxml2xmloutdata/audio-oss-best.xml deleted file mode 120000 index e716f61f72..0000000000 --- a/tests/qemuxml2xmloutdata/audio-oss-best.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-oss-best.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-oss-best.xml b/tests/qemuxml2xmloutdata/audio-oss-best.xml new file mode 100644 index 0000000000..cf0eac2fdf --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-oss-best.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='oss' timerPeriod='50'> + <input mixingEngine='yes' fixedSettings='yes' voices='1' dev='/dev/dsp0' bufferCount='30' tryPoll='yes'> + <settings frequency='44100' channels='2' format='s16'/> + </input> + <output mixingEngine='yes' fixedSettings='yes' voices='2' dev='/dev/dsp1' bufferCount='30' tryPoll='no'> + <settings frequency='22050' channels='4' format='f32'/> + </output> + </audio> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-oss-full.xml b/tests/qemuxml2xmloutdata/audio-oss-full.xml deleted file mode 120000 index 6073f438a0..0000000000 --- a/tests/qemuxml2xmloutdata/audio-oss-full.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-oss-full.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-oss-full.xml b/tests/qemuxml2xmloutdata/audio-oss-full.xml new file mode 100644 index 0000000000..b9acccff36 --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-oss-full.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='oss' tryMMap='yes' exclusive='yes' dspPolicy='3'> + <input mixingEngine='yes' fixedSettings='yes' voices='1' bufferLength='100' dev='/dev/dsp0' bufferCount='50' tryPoll='yes'> + <settings frequency='44100' channels='2' format='s16'/> + </input> + <output mixingEngine='yes' fixedSettings='yes' voices='2' bufferLength='200' dev='/dev/dsp1' bufferCount='30' tryPoll='no'> + <settings frequency='22050' channels='4' format='f32'/> + </output> + </audio> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-oss-minimal.xml b/tests/qemuxml2xmloutdata/audio-oss-minimal.xml deleted file mode 120000 index d30a208e69..0000000000 --- a/tests/qemuxml2xmloutdata/audio-oss-minimal.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-oss-minimal.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-oss-minimal.xml b/tests/qemuxml2xmloutdata/audio-oss-minimal.xml new file mode 100644 index 0000000000..47da331bab --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-oss-minimal.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='oss'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml b/tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml deleted file mode 120000 index d77efcd7bf..0000000000 --- a/tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-pulseaudio-best.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml b/tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml new file mode 100644 index 0000000000..1a4609e9ed --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='pulseaudio' timerPeriod='50' serverName='acme.example.org'> + <input mixingEngine='yes' fixedSettings='yes' voices='1' bufferLength='200' name='fish'> + <settings frequency='44100' channels='2' format='s16'/> + </input> + <output mixingEngine='yes' fixedSettings='yes' voices='2' bufferLength='200' name='fish'> + <settings frequency='22050' channels='4' format='f32'/> + </output> + </audio> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml b/tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml deleted file mode 120000 index c12f36702d..0000000000 --- a/tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-pulseaudio-full.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml b/tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml new file mode 100644 index 0000000000..e15098e1e8 --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='pulseaudio' serverName='acme.example.org'> + <input mixingEngine='yes' fixedSettings='yes' voices='1' bufferLength='100' name='fish' streamName='food' latency='100'> + <settings frequency='44100' channels='2' format='s16'/> + </input> + <output mixingEngine='yes' fixedSettings='yes' voices='2' bufferLength='200' name='fish' streamName='food' latency='200'> + <settings frequency='22050' channels='4' format='f32'/> + </output> + </audio> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml b/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml deleted file mode 120000 index 9cba6b5f00..0000000000 --- a/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-pulseaudio-minimal.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml b/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml new file mode 100644 index 0000000000..6a947c0239 --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='pulseaudio'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-sdl-best.xml b/tests/qemuxml2xmloutdata/audio-sdl-best.xml deleted file mode 120000 index 0c90810974..0000000000 --- a/tests/qemuxml2xmloutdata/audio-sdl-best.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-sdl-best.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-sdl-best.xml b/tests/qemuxml2xmloutdata/audio-sdl-best.xml new file mode 100644 index 0000000000..84f810c61a --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-sdl-best.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='sdl' timerPeriod='50' driver='pulseaudio'> + <input mixingEngine='yes' fixedSettings='yes' voices='1'> + <settings frequency='44100' channels='2' format='s16'/> + </input> + <output mixingEngine='yes' fixedSettings='yes' voices='2' bufferLength='200'> + <settings frequency='22050' channels='4' format='f32'/> + </output> + </audio> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-sdl-full.xml b/tests/qemuxml2xmloutdata/audio-sdl-full.xml deleted file mode 120000 index faeeb0ef35..0000000000 --- a/tests/qemuxml2xmloutdata/audio-sdl-full.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-sdl-full.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-sdl-full.xml b/tests/qemuxml2xmloutdata/audio-sdl-full.xml new file mode 100644 index 0000000000..c96182e9fb --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-sdl-full.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='sdl' driver='pulseaudio'> + <input mixingEngine='yes' fixedSettings='yes' voices='1' bufferLength='100' bufferCount='40'> + <settings frequency='44100' channels='2' format='s16'/> + </input> + <output mixingEngine='yes' fixedSettings='yes' voices='2' bufferLength='200' bufferCount='50'> + <settings frequency='22050' channels='4' format='f32'/> + </output> + </audio> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-sdl-minimal.xml b/tests/qemuxml2xmloutdata/audio-sdl-minimal.xml deleted file mode 120000 index 787b220f0a..0000000000 --- a/tests/qemuxml2xmloutdata/audio-sdl-minimal.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-sdl-minimal.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-sdl-minimal.xml b/tests/qemuxml2xmloutdata/audio-sdl-minimal.xml new file mode 100644 index 0000000000..23793b6155 --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-sdl-minimal.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='sdl'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-spice-best.xml b/tests/qemuxml2xmloutdata/audio-spice-best.xml deleted file mode 120000 index 0e52fb5460..0000000000 --- a/tests/qemuxml2xmloutdata/audio-spice-best.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-spice-best.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-spice-best.xml b/tests/qemuxml2xmloutdata/audio-spice-best.xml new file mode 100644 index 0000000000..80594ebca6 --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-spice-best.xml @@ -0,0 +1,50 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='spice'> + <listen type='none'/> + </graphics> + <audio id='1' type='spice' timerPeriod='50'> + <input mixingEngine='yes' fixedSettings='yes' voices='1'> + <settings frequency='44100' channels='2' format='s16'/> + </input> + <output mixingEngine='yes' fixedSettings='yes' voices='2'> + <settings frequency='22050' channels='4' format='f32'/> + </output> + </audio> + <video> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-spice-full.xml b/tests/qemuxml2xmloutdata/audio-spice-full.xml deleted file mode 120000 index 088605f0bc..0000000000 --- a/tests/qemuxml2xmloutdata/audio-spice-full.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-spice-full.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-spice-full.xml b/tests/qemuxml2xmloutdata/audio-spice-full.xml new file mode 100644 index 0000000000..c9f00f8c8c --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-spice-full.xml @@ -0,0 +1,50 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='spice'> + <listen type='none'/> + </graphics> + <audio id='1' type='spice'> + <input mixingEngine='yes' fixedSettings='yes' voices='1' bufferLength='100'> + <settings frequency='44100' channels='2' format='s16'/> + </input> + <output mixingEngine='yes' fixedSettings='yes' voices='2' bufferLength='200'> + <settings frequency='22050' channels='4' format='f32'/> + </output> + </audio> + <video> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/audio-spice-minimal.xml b/tests/qemuxml2xmloutdata/audio-spice-minimal.xml deleted file mode 120000 index 5f07fd844a..0000000000 --- a/tests/qemuxml2xmloutdata/audio-spice-minimal.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/audio-spice-minimal.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/audio-spice-minimal.xml b/tests/qemuxml2xmloutdata/audio-spice-minimal.xml new file mode 100644 index 0000000000..d5fd97b9ac --- /dev/null +++ b/tests/qemuxml2xmloutdata/audio-spice-minimal.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='cdrom'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='cdrom'> + <driver name='qemu' type='raw'/> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='spice'> + <listen type='none'/> + </graphics> + <audio id='1' type='spice'/> + <video> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='none'/> + </devices> +</domain> -- 2.40.1
Convert all of the 'audio-default-*' cases to use capabilities from qemu-4.2 instead of the fake caps. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...default-sdl.args => audio-default-sdl.x86_64-4.2.0.args} | 6 ++++-- ...ult-spice.args => audio-default-spice.x86_64-4.2.0.args} | 6 ++++-- ...default-vnc.args => audio-default-vnc.x86_64-4.2.0.args} | 6 ++++-- tests/qemuxml2argvtest.c | 6 +++--- 4 files changed, 15 insertions(+), 9 deletions(-) rename tests/qemuxml2argvdata/{audio-default-sdl.args => audio-default-sdl.x86_64-4.2.0.args} (86%) rename tests/qemuxml2argvdata/{audio-default-spice.args => audio-default-spice.x86_64-4.2.0.args} (86%) rename tests/qemuxml2argvdata/{audio-default-vnc.args => audio-default-vnc.x86_64-4.2.0.args} (86%) diff --git a/tests/qemuxml2argvdata/audio-default-sdl.args b/tests/qemuxml2argvdata/audio-default-sdl.x86_64-4.2.0.args similarity index 86% rename from tests/qemuxml2argvdata/audio-default-sdl.args rename to tests/qemuxml2argvdata/audio-default-sdl.x86_64-4.2.0.args index 4fc9d3cd9a..7a45ba182f 100644 --- a/tests/qemuxml2argvdata/audio-default-sdl.args +++ b/tests/qemuxml2argvdata/audio-default-sdl.x86_64-4.2.0.args @@ -11,8 +11,9 @@ SDL_AUDIODRIVER=esd \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.2,usb=off,dump-guest-core=off \ -accel tcg \ +-cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ @@ -25,11 +26,12 @@ SDL_AUDIODRIVER=esd \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \ -audiodev '{"id":"audio1","driver":"sdl"}' \ -display sdl \ -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-default-spice.args b/tests/qemuxml2argvdata/audio-default-spice.x86_64-4.2.0.args similarity index 86% rename from tests/qemuxml2argvdata/audio-default-spice.args rename to tests/qemuxml2argvdata/audio-default-spice.x86_64-4.2.0.args index 30b93a54c7..9f344cef42 100644 --- a/tests/qemuxml2argvdata/audio-default-spice.args +++ b/tests/qemuxml2argvdata/audio-default-spice.x86_64-4.2.0.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.2,usb=off,dump-guest-core=off \ -accel tcg \ +-cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ @@ -24,11 +25,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -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-default-vnc.args b/tests/qemuxml2argvdata/audio-default-vnc.x86_64-4.2.0.args similarity index 86% rename from tests/qemuxml2argvdata/audio-default-vnc.args rename to tests/qemuxml2argvdata/audio-default-vnc.x86_64-4.2.0.args index 3bb8de4a97..5aa7e82954 100644 --- a/tests/qemuxml2argvdata/audio-default-vnc.args +++ b/tests/qemuxml2argvdata/audio-default-vnc.x86_64-4.2.0.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine pc,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.2,usb=off,dump-guest-core=off \ -accel tcg \ +-cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ @@ -24,11 +25,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=on \ --usb \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \ -audiodev '{"id":"audio1","driver":"alsa"}' \ -vnc 127.0.0.1:0,audiodev=audio1 \ -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 3100078b54..1da4aaec90 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -995,19 +995,19 @@ mymain(void) /* Validate auto-creation of <audio> for legacy compat */ g_setenv("QEMU_AUDIO_DRV", "sdl", TRUE); g_setenv("SDL_AUDIODRIVER", "esd", TRUE); - DO_TEST("audio-default-sdl", QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_SDL); + DO_TEST_CAPS_VER("audio-default-sdl", "4.2.0"); DO_TEST_CAPS_LATEST("audio-default-sdl"); g_unsetenv("QEMU_AUDIO_DRV"); g_unsetenv("SDL_AUDIODRIVER"); g_setenv("QEMU_AUDIO_DRV", "alsa", TRUE); driver.config->vncAllowHostAudio = true; - DO_TEST("audio-default-vnc", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_VER("audio-default-vnc", "4.2.0"); DO_TEST_CAPS_LATEST("audio-default-vnc"); driver.config->vncAllowHostAudio = false; g_unsetenv("QEMU_AUDIO_DRV"); - DO_TEST("audio-default-spice", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_VER("audio-default-spice", "4.2.0"); DO_TEST_CAPS_LATEST("audio-default-spice"); g_setenv("QEMU_AUDIO_DRV", "alsa", TRUE); -- 2.40.1
Use DO_TEST_CAPS_LATEST to run with the latest capapbilities. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ....xml => audio-alsa-best.x86_64-latest.xml} | 5 +- ....xml => audio-alsa-full.x86_64-latest.xml} | 5 +- ...l => audio-alsa-minimal.x86_64-latest.xml} | 5 +- ...=> audio-coreaudio-best.x86_64-latest.xml} | 5 +- ...=> audio-coreaudio-full.x86_64-latest.xml} | 5 +- ...audio-coreaudio-minimal.x86_64-latest.xml} | 5 +- ....xml => audio-file-best.x86_64-latest.xml} | 5 +- ....xml => audio-file-full.x86_64-latest.xml} | 5 +- ...l => audio-file-minimal.x86_64-latest.xml} | 5 +- ....xml => audio-jack-full.x86_64-latest.xml} | 5 +- ....xml => audio-none-best.x86_64-latest.xml} | 5 +- ....xml => audio-none-full.x86_64-latest.xml} | 5 +- ...l => audio-none-minimal.x86_64-latest.xml} | 5 +- ...t.xml => audio-oss-best.x86_64-latest.xml} | 5 +- ...l.xml => audio-oss-full.x86_64-latest.xml} | 5 +- ...ml => audio-oss-minimal.x86_64-latest.xml} | 5 +- ...> audio-pulseaudio-best.x86_64-latest.xml} | 5 +- ...> audio-pulseaudio-full.x86_64-latest.xml} | 5 +- ...udio-pulseaudio-minimal.x86_64-latest.xml} | 5 +- ...t.xml => audio-sdl-best.x86_64-latest.xml} | 5 +- ...l.xml => audio-sdl-full.x86_64-latest.xml} | 5 +- ...ml => audio-sdl-minimal.x86_64-latest.xml} | 5 +- ...xml => audio-spice-best.x86_64-latest.xml} | 5 +- ...xml => audio-spice-full.x86_64-latest.xml} | 5 +- ... => audio-spice-minimal.x86_64-latest.xml} | 5 +- tests/qemuxml2xmltest.c | 56 +++++++++---------- 26 files changed, 125 insertions(+), 56 deletions(-) rename tests/qemuxml2xmloutdata/{audio-alsa-best.xml => audio-alsa-best.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-alsa-full.xml => audio-alsa-full.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-alsa-minimal.xml => audio-alsa-minimal.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{audio-coreaudio-best.xml => audio-coreaudio-best.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-coreaudio-full.xml => audio-coreaudio-full.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-coreaudio-minimal.xml => audio-coreaudio-minimal.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{audio-file-best.xml => audio-file-best.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-file-full.xml => audio-file-full.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-file-minimal.xml => audio-file-minimal.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{audio-jack-full.xml => audio-jack-full.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{audio-none-best.xml => audio-none-best.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-none-full.xml => audio-none-full.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-none-minimal.xml => audio-none-minimal.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{audio-oss-best.xml => audio-oss-best.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{audio-oss-full.xml => audio-oss-full.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{audio-oss-minimal.xml => audio-oss-minimal.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{audio-pulseaudio-best.xml => audio-pulseaudio-best.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{audio-pulseaudio-full.xml => audio-pulseaudio-full.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{audio-pulseaudio-minimal.xml => audio-pulseaudio-minimal.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{audio-sdl-best.xml => audio-sdl-best.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-sdl-full.xml => audio-sdl-full.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{audio-sdl-minimal.xml => audio-sdl-minimal.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{audio-spice-best.xml => audio-spice-best.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{audio-spice-full.xml => audio-spice-full.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{audio-spice-minimal.xml => audio-spice-minimal.x86_64-latest.xml} (90%) diff --git a/tests/qemuxml2xmloutdata/audio-alsa-best.xml b/tests/qemuxml2xmloutdata/audio-alsa-best.x86_64-latest.xml similarity index 90% rename from tests/qemuxml2xmloutdata/audio-alsa-best.xml rename to tests/qemuxml2xmloutdata/audio-alsa-best.x86_64-latest.xml index 29283ab7d2..36e4b27257 100644 --- a/tests/qemuxml2xmloutdata/audio-alsa-best.xml +++ b/tests/qemuxml2xmloutdata/audio-alsa-best.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-alsa-full.xml b/tests/qemuxml2xmloutdata/audio-alsa-full.x86_64-latest.xml similarity index 90% rename from tests/qemuxml2xmloutdata/audio-alsa-full.xml rename to tests/qemuxml2xmloutdata/audio-alsa-full.x86_64-latest.xml index 4205ecde89..49a659de62 100644 --- a/tests/qemuxml2xmloutdata/audio-alsa-full.xml +++ b/tests/qemuxml2xmloutdata/audio-alsa-full.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-alsa-minimal.xml b/tests/qemuxml2xmloutdata/audio-alsa-minimal.x86_64-latest.xml similarity index 88% rename from tests/qemuxml2xmloutdata/audio-alsa-minimal.xml rename to tests/qemuxml2xmloutdata/audio-alsa-minimal.x86_64-latest.xml index 57ff9d2bf0..e48452b186 100644 --- a/tests/qemuxml2xmloutdata/audio-alsa-minimal.xml +++ b/tests/qemuxml2xmloutdata/audio-alsa-minimal.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-best.xml b/tests/qemuxml2xmloutdata/audio-coreaudio-best.x86_64-latest.xml similarity index 90% rename from tests/qemuxml2xmloutdata/audio-coreaudio-best.xml rename to tests/qemuxml2xmloutdata/audio-coreaudio-best.x86_64-latest.xml index d171cc752f..4fc32f5e73 100644 --- a/tests/qemuxml2xmloutdata/audio-coreaudio-best.xml +++ b/tests/qemuxml2xmloutdata/audio-coreaudio-best.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-full.xml b/tests/qemuxml2xmloutdata/audio-coreaudio-full.x86_64-latest.xml similarity index 90% rename from tests/qemuxml2xmloutdata/audio-coreaudio-full.xml rename to tests/qemuxml2xmloutdata/audio-coreaudio-full.x86_64-latest.xml index b6427a6e9f..b874bbb48e 100644 --- a/tests/qemuxml2xmloutdata/audio-coreaudio-full.xml +++ b/tests/qemuxml2xmloutdata/audio-coreaudio-full.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml b/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.x86_64-latest.xml similarity index 88% rename from tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml rename to tests/qemuxml2xmloutdata/audio-coreaudio-minimal.x86_64-latest.xml index dac55ecbce..f9209782b5 100644 --- a/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml +++ b/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-file-best.xml b/tests/qemuxml2xmloutdata/audio-file-best.x86_64-latest.xml similarity index 90% rename from tests/qemuxml2xmloutdata/audio-file-best.xml rename to tests/qemuxml2xmloutdata/audio-file-best.x86_64-latest.xml index 9946ad9e3d..c86beb619b 100644 --- a/tests/qemuxml2xmloutdata/audio-file-best.xml +++ b/tests/qemuxml2xmloutdata/audio-file-best.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-file-full.xml b/tests/qemuxml2xmloutdata/audio-file-full.x86_64-latest.xml similarity index 90% rename from tests/qemuxml2xmloutdata/audio-file-full.xml rename to tests/qemuxml2xmloutdata/audio-file-full.x86_64-latest.xml index 1e4c50f44a..5479958a93 100644 --- a/tests/qemuxml2xmloutdata/audio-file-full.xml +++ b/tests/qemuxml2xmloutdata/audio-file-full.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-file-minimal.xml b/tests/qemuxml2xmloutdata/audio-file-minimal.x86_64-latest.xml similarity index 88% rename from tests/qemuxml2xmloutdata/audio-file-minimal.xml rename to tests/qemuxml2xmloutdata/audio-file-minimal.x86_64-latest.xml index 65f2c56a90..6b6269886d 100644 --- a/tests/qemuxml2xmloutdata/audio-file-minimal.xml +++ b/tests/qemuxml2xmloutdata/audio-file-minimal.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-jack-full.xml b/tests/qemuxml2xmloutdata/audio-jack-full.x86_64-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/audio-jack-full.xml rename to tests/qemuxml2xmloutdata/audio-jack-full.x86_64-latest.xml index 0583a305b1..35308678e3 100644 --- a/tests/qemuxml2xmloutdata/audio-jack-full.xml +++ b/tests/qemuxml2xmloutdata/audio-jack-full.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-none-best.xml b/tests/qemuxml2xmloutdata/audio-none-best.x86_64-latest.xml similarity index 90% rename from tests/qemuxml2xmloutdata/audio-none-best.xml rename to tests/qemuxml2xmloutdata/audio-none-best.x86_64-latest.xml index 98c3b17a84..77373cfb2b 100644 --- a/tests/qemuxml2xmloutdata/audio-none-best.xml +++ b/tests/qemuxml2xmloutdata/audio-none-best.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-none-full.xml b/tests/qemuxml2xmloutdata/audio-none-full.x86_64-latest.xml similarity index 90% rename from tests/qemuxml2xmloutdata/audio-none-full.xml rename to tests/qemuxml2xmloutdata/audio-none-full.x86_64-latest.xml index 85437c67f2..d1383142a0 100644 --- a/tests/qemuxml2xmloutdata/audio-none-full.xml +++ b/tests/qemuxml2xmloutdata/audio-none-full.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-none-minimal.xml b/tests/qemuxml2xmloutdata/audio-none-minimal.x86_64-latest.xml similarity index 88% rename from tests/qemuxml2xmloutdata/audio-none-minimal.xml rename to tests/qemuxml2xmloutdata/audio-none-minimal.x86_64-latest.xml index 4666777e56..8589f05399 100644 --- a/tests/qemuxml2xmloutdata/audio-none-minimal.xml +++ b/tests/qemuxml2xmloutdata/audio-none-minimal.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-oss-best.xml b/tests/qemuxml2xmloutdata/audio-oss-best.x86_64-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/audio-oss-best.xml rename to tests/qemuxml2xmloutdata/audio-oss-best.x86_64-latest.xml index cf0eac2fdf..b0e068c832 100644 --- a/tests/qemuxml2xmloutdata/audio-oss-best.xml +++ b/tests/qemuxml2xmloutdata/audio-oss-best.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-oss-full.xml b/tests/qemuxml2xmloutdata/audio-oss-full.x86_64-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/audio-oss-full.xml rename to tests/qemuxml2xmloutdata/audio-oss-full.x86_64-latest.xml index b9acccff36..c90e710681 100644 --- a/tests/qemuxml2xmloutdata/audio-oss-full.xml +++ b/tests/qemuxml2xmloutdata/audio-oss-full.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-oss-minimal.xml b/tests/qemuxml2xmloutdata/audio-oss-minimal.x86_64-latest.xml similarity index 88% rename from tests/qemuxml2xmloutdata/audio-oss-minimal.xml rename to tests/qemuxml2xmloutdata/audio-oss-minimal.x86_64-latest.xml index 47da331bab..ce0d2cb8e7 100644 --- a/tests/qemuxml2xmloutdata/audio-oss-minimal.xml +++ b/tests/qemuxml2xmloutdata/audio-oss-minimal.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml b/tests/qemuxml2xmloutdata/audio-pulseaudio-best.x86_64-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml rename to tests/qemuxml2xmloutdata/audio-pulseaudio-best.x86_64-latest.xml index 1a4609e9ed..76adca9482 100644 --- a/tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml +++ b/tests/qemuxml2xmloutdata/audio-pulseaudio-best.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml b/tests/qemuxml2xmloutdata/audio-pulseaudio-full.x86_64-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml rename to tests/qemuxml2xmloutdata/audio-pulseaudio-full.x86_64-latest.xml index e15098e1e8..87258c3d69 100644 --- a/tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml +++ b/tests/qemuxml2xmloutdata/audio-pulseaudio-full.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml b/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.x86_64-latest.xml similarity index 88% rename from tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml rename to tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.x86_64-latest.xml index 6a947c0239..c53d0dc1f4 100644 --- a/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml +++ b/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-sdl-best.xml b/tests/qemuxml2xmloutdata/audio-sdl-best.x86_64-latest.xml similarity index 90% rename from tests/qemuxml2xmloutdata/audio-sdl-best.xml rename to tests/qemuxml2xmloutdata/audio-sdl-best.x86_64-latest.xml index 84f810c61a..79a8538c86 100644 --- a/tests/qemuxml2xmloutdata/audio-sdl-best.xml +++ b/tests/qemuxml2xmloutdata/audio-sdl-best.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-sdl-full.xml b/tests/qemuxml2xmloutdata/audio-sdl-full.x86_64-latest.xml similarity index 90% rename from tests/qemuxml2xmloutdata/audio-sdl-full.xml rename to tests/qemuxml2xmloutdata/audio-sdl-full.x86_64-latest.xml index c96182e9fb..13c6d7d1e2 100644 --- a/tests/qemuxml2xmloutdata/audio-sdl-full.xml +++ b/tests/qemuxml2xmloutdata/audio-sdl-full.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-sdl-minimal.xml b/tests/qemuxml2xmloutdata/audio-sdl-minimal.x86_64-latest.xml similarity index 88% rename from tests/qemuxml2xmloutdata/audio-sdl-minimal.xml rename to tests/qemuxml2xmloutdata/audio-sdl-minimal.x86_64-latest.xml index 23793b6155..5bf3196a35 100644 --- a/tests/qemuxml2xmloutdata/audio-sdl-minimal.xml +++ b/tests/qemuxml2xmloutdata/audio-sdl-minimal.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-spice-best.xml b/tests/qemuxml2xmloutdata/audio-spice-best.x86_64-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/audio-spice-best.xml rename to tests/qemuxml2xmloutdata/audio-spice-best.x86_64-latest.xml index 80594ebca6..9017277a70 100644 --- a/tests/qemuxml2xmloutdata/audio-spice-best.xml +++ b/tests/qemuxml2xmloutdata/audio-spice-best.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-spice-full.xml b/tests/qemuxml2xmloutdata/audio-spice-full.x86_64-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/audio-spice-full.xml rename to tests/qemuxml2xmloutdata/audio-spice-full.x86_64-latest.xml index c9f00f8c8c..6db1f6889d 100644 --- a/tests/qemuxml2xmloutdata/audio-spice-full.xml +++ b/tests/qemuxml2xmloutdata/audio-spice-full.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmloutdata/audio-spice-minimal.xml b/tests/qemuxml2xmloutdata/audio-spice-minimal.x86_64-latest.xml similarity index 90% rename from tests/qemuxml2xmloutdata/audio-spice-minimal.xml rename to tests/qemuxml2xmloutdata/audio-spice-minimal.x86_64-latest.xml index d5fd97b9ac..e9cba5a772 100644 --- a/tests/qemuxml2xmloutdata/audio-spice-minimal.xml +++ b/tests/qemuxml2xmloutdata/audio-spice-minimal.x86_64-latest.xml @@ -8,6 +8,9 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='cdrom'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -21,7 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 93202e8e18..0f9d642730 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1170,41 +1170,35 @@ mymain(void) DO_TEST_NOCAPS("downscript"); /* 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_NOCAPS("audio-oss-minimal"); - DO_TEST_NOCAPS("audio-pulseaudio-minimal"); - DO_TEST_NOCAPS("audio-sdl-minimal"); - DO_TEST("audio-spice-minimal", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST_NOCAPS("audio-file-minimal"); + DO_TEST_CAPS_LATEST("audio-none-minimal"); + DO_TEST_CAPS_LATEST("audio-alsa-minimal"); + DO_TEST_CAPS_LATEST("audio-coreaudio-minimal"); + DO_TEST_CAPS_LATEST("audio-oss-minimal"); + DO_TEST_CAPS_LATEST("audio-pulseaudio-minimal"); + DO_TEST_CAPS_LATEST("audio-sdl-minimal"); + DO_TEST_CAPS_LATEST("audio-spice-minimal"); + 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("audio-spice-best", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST_NOCAPS("audio-file-best"); + DO_TEST_CAPS_LATEST("audio-none-best"); + DO_TEST_CAPS_LATEST("audio-alsa-best"); + DO_TEST_CAPS_LATEST("audio-coreaudio-best"); + DO_TEST_CAPS_LATEST("audio-oss-best"); + DO_TEST_CAPS_LATEST("audio-pulseaudio-best"); + DO_TEST_CAPS_LATEST("audio-sdl-best"); + 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_NOCAPS("audio-none-full"); - DO_TEST_NOCAPS("audio-alsa-full"); - DO_TEST_NOCAPS("audio-coreaudio-full"); - DO_TEST_NOCAPS("audio-jack-full"); - DO_TEST_NOCAPS("audio-oss-full"); - DO_TEST_NOCAPS("audio-pulseaudio-full"); - DO_TEST_NOCAPS("audio-sdl-full"); - DO_TEST("audio-spice-full", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST_NOCAPS("audio-file-full"); + DO_TEST_CAPS_LATEST("audio-none-full"); + DO_TEST_CAPS_LATEST("audio-alsa-full"); + DO_TEST_CAPS_LATEST("audio-coreaudio-full"); + DO_TEST_CAPS_LATEST("audio-jack-full"); + DO_TEST_CAPS_LATEST("audio-oss-full"); + DO_TEST_CAPS_LATEST("audio-pulseaudio-full"); + DO_TEST_CAPS_LATEST("audio-sdl-full"); + DO_TEST_CAPS_LATEST("audio-spice-full"); + DO_TEST_CAPS_LATEST("audio-file-full"); DO_TEST_CAPS_LATEST("audio-many-backends"); -- 2.40.1
On a Tuesday in 2023, Peter Krempa wrote:
Few things I've cleaned up before realizing that:
https://gitlab.com/libvirt/libvirt/-/issues/473
can't really be solved without qemu assistance.
Peter Krempa (3): qemuxml2xmlout: Replace symlinks of all 'audio-' tests by real files qemuxml2argvtest: Use real caps instead of fake caps for 'audio-default-*' cases qemuxml2xmltest: Modernize all 'audio-' cases
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (2)
-
Ján Tomko -
Peter Krempa