External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-27 22:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: qemu: Extend the test suite with the 'output' sound codec

Browse Source 
Affects qemuxml2xmltest and qemuxml2argvtest.

Signed-off-by: Filip Alac <filipalac@gmail.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Filip Alac 2018-05-22 13:12:34 +02:00 committed by Erik Skultety
parent 3b8d050911
commit 8dd3a63184
9 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/qemustatusxml2xmldata/migration-in-params-in.xml
View File

@ -236,6 +236,7 @@
<flag name='iscsi.password-secret'/> <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='dump-completed'/> <flag name='dump-completed'/>
<flag name='hda-output'/>
</qemuCaps> </qemuCaps>
<job type='none' async='migration in' phase='prepare' flags='0x900'> <job type='none' async='migration in' phase='prepare' flags='0x900'>
<migParams> <migParams>

1
tests/qemustatusxml2xmldata/migration-out-nbd-in.xml
View File

@ -229,6 +229,7 @@
<flag name='iscsi.password-secret'/> <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='dump-completed'/> <flag name='dump-completed'/>
<flag name='hda-output'/>
</qemuCaps> </qemuCaps>
<job type='none' async='migration out' phase='perform3'> <job type='none' async='migration out' phase='perform3'>
<disk dev='vdb' migrating='yes'/> <disk dev='vdb' migrating='yes'/>

1
tests/qemustatusxml2xmldata/migration-out-nbd-out.xml
View File

@ -229,6 +229,7 @@
<flag name='iscsi.password-secret'/> <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='dump-completed'/> <flag name='dump-completed'/>
<flag name='hda-output'/>
</qemuCaps> </qemuCaps>
<job type='none' async='migration out' phase='perform3' flags='0x0'> <job type='none' async='migration out' phase='perform3' flags='0x0'>
<disk dev='vdb' migrating='yes'/> <disk dev='vdb' migrating='yes'/>

1
tests/qemustatusxml2xmldata/migration-out-params-in.xml
View File

@ -236,6 +236,7 @@
<flag name='iscsi.password-secret'/> <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='dump-completed'/> <flag name='dump-completed'/>
<flag name='hda-output'/>
</qemuCaps> </qemuCaps>
<job type='none' async='migration out' phase='perform3' flags='0x802'> <job type='none' async='migration out' phase='perform3' flags='0x802'>
<disk dev='vda' migrating='no'/> <disk dev='vda' migrating='no'/>

1
tests/qemustatusxml2xmldata/modern-in.xml
View File

@ -232,6 +232,7 @@
<flag name='iscsi.password-secret'/> <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='dump-completed'/> <flag name='dump-completed'/>
<flag name='hda-output'/>
</qemuCaps> </qemuCaps>
<devices> <devices>
<device alias='rng0'/> <device alias='rng0'/>

2
tests/qemuxml2argvdata/sound-device.args
View File

@ -33,10 +33,12 @@ server,nowait \
-device intel-hda,id=sound5,bus=pci.0,addr=0x6 \ -device intel-hda,id=sound5,bus=pci.0,addr=0x6 \
-device hda-micro,id=sound5-codec0,bus=sound5.0,cad=0 \ -device hda-micro,id=sound5-codec0,bus=sound5.0,cad=0 \
-device hda-duplex,id=sound5-codec1,bus=sound5.0,cad=1 \ -device hda-duplex,id=sound5-codec1,bus=sound5.0,cad=1 \
-device hda-output,id=sound5-codec2,bus=sound5.0,cad=2 \
-device ich9-intel-hda,id=sound6,bus=pci.0,addr=0x7 \ -device ich9-intel-hda,id=sound6,bus=pci.0,addr=0x7 \
-device hda-duplex,id=sound6-codec0,bus=sound6.0,cad=0 \ -device hda-duplex,id=sound6-codec0,bus=sound6.0,cad=0 \
-device ich9-intel-hda,id=sound7,bus=pci.0,addr=0x8 \ -device ich9-intel-hda,id=sound7,bus=pci.0,addr=0x8 \
-device hda-micro,id=sound7-codec0,bus=sound7.0,cad=0 \ -device hda-micro,id=sound7-codec0,bus=sound7.0,cad=0 \
-device hda-duplex,id=sound7-codec1,bus=sound7.0,cad=1 \ -device hda-duplex,id=sound7-codec1,bus=sound7.0,cad=1 \
-device hda-output,id=sound7-codec2,bus=sound7.0,cad=2 \
-device usb-audio,id=sound8,bus=usb.0,port=1 \ -device usb-audio,id=sound8,bus=usb.0,port=1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x9 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x9

2
tests/qemuxml2argvdata/sound-device.xml
View File

@ -32,11 +32,13 @@
<sound model='ich6'> <sound model='ich6'>
<codec type='micro'/> <codec type='micro'/>
<codec type='duplex'/> <codec type='duplex'/>
<codec type='output'/>
</sound> </sound>
<sound model='ich9'/> <sound model='ich9'/>
<sound model='ich9'> <sound model='ich9'>
<codec type='micro'/> <codec type='micro'/>
<codec type='duplex'/> <codec type='duplex'/>
<codec type='output'/>
</sound> </sound>
<sound model='usb'/> <sound model='usb'/>
<memballoon model='virtio'/> <memballoon model='virtio'/>

1
tests/qemuxml2argvtest.c
View File

@ -1518,6 +1518,7 @@ mymain(void)
DO_TEST("sound", NONE); DO_TEST("sound", NONE);
DO_TEST("sound-device", DO_TEST("sound-device",
QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_HDA_MICRO, QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_HDA_MICRO,
QEMU_CAPS_HDA_OUTPUT,
QEMU_CAPS_DEVICE_ICH9_INTEL_HDA, QEMU_CAPS_DEVICE_ICH9_INTEL_HDA,
QEMU_CAPS_OBJECT_USB_AUDIO); QEMU_CAPS_OBJECT_USB_AUDIO);
DO_TEST("fs9p", NONE); DO_TEST("fs9p", NONE);

2
tests/qemuxml2xmloutdata/sound-device.xml
View File

@ -43,6 +43,7 @@
<sound model='ich6'> <sound model='ich6'>
<codec type='micro'/> <codec type='micro'/>
<codec type='duplex'/> <codec type='duplex'/>
<codec type='output'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
</sound> </sound>
<sound model='ich9'> <sound model='ich9'>
@ -51,6 +52,7 @@
<sound model='ich9'> <sound model='ich9'>
<codec type='micro'/> <codec type='micro'/>
<codec type='duplex'/> <codec type='duplex'/>
<codec type='output'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
</sound> </sound>
<sound model='usb'/> <sound model='usb'/>