[libvirt] [PATCH v4 3/4] tests: qemu: Extends tests for 'output' codec

Signed-off-by: Filip Alac <filipalac(a)gmail.com&gt; --- tests/qemustatusxml2xmldata/migration-in-params-in.xml | 1 + tests/qemustatusxml2xmldata/migration-out-nbd-in.xml | 1 + tests/qemustatusxml2xmldata/migration-out-nbd-out.xml | 1 + tests/qemustatusxml2xmldata/migration-out-params-in.xml | 1 + tests/qemustatusxml2xmldata/modern-in.xml | 1 + tests/qemuxml2argvdata/sound-device.args | 2 ++ tests/qemuxml2argvdata/sound-device.xml | 2 ++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/sound-device.xml | 2 ++ 9 files changed, 12 insertions(+) diff --git a/tests/qemustatusxml2xmldata/migration-in-params-in.xml b/tests/qemustatusxml2xmldata/migration-in-params-in.xml index b0caa34..03f18b4 100644 --- a/tests/qemustatusxml2xmldata/migration-in-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-in-params-in.xml @@ -236,6 +236,7 @@ <flag name='iscsi.password-secret'/> <flag name='isa-serial'/> <flag name='dump-completed'/> + <flag name='hda-output'/> </qemuCaps> <job type='none' async='migration in' phase='prepare' flags='0x900'> <migParams> diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-in.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-in.xml index 6d87c1e..636accf 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-in.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-in.xml @@ -229,6 +229,7 @@ <flag name='iscsi.password-secret'/> <flag name='isa-serial'/> <flag name='dump-completed'/> + <flag name='hda-output'/> </qemuCaps> <job type='none' async='migration out' phase='perform3'> <disk dev='vdb' migrating='yes'/> diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml index 05da1f8..315d8e4 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml @@ -229,6 +229,7 @@ <flag name='iscsi.password-secret'/> <flag name='isa-serial'/> <flag name='dump-completed'/> + <flag name='hda-output'/> </qemuCaps> <job type='none' async='migration out' phase='perform3' flags='0x0'> <disk dev='vdb' migrating='yes'/> diff --git a/tests/qemustatusxml2xmldata/migration-out-params-in.xml b/tests/qemustatusxml2xmldata/migration-out-params-in.xml index 1764979..ae20648 100644 --- a/tests/qemustatusxml2xmldata/migration-out-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-out-params-in.xml @@ -236,6 +236,7 @@ <flag name='iscsi.password-secret'/> <flag name='isa-serial'/> <flag name='dump-completed'/> + <flag name='hda-output'/> </qemuCaps> <job type='none' async='migration out' phase='perform3' flags='0x802'> <disk dev='vda' migrating='no'/> diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxml2xmldata/modern-in.xml index d63fcf7..5b7e2a3 100644 --- a/tests/qemustatusxml2xmldata/modern-in.xml +++ b/tests/qemustatusxml2xmldata/modern-in.xml @@ -232,6 +232,7 @@ <flag name='iscsi.password-secret'/> <flag name='isa-serial'/> <flag name='dump-completed'/> + <flag name='hda-output'/> </qemuCaps> <devices> <device alias='rng0'/> diff --git a/tests/qemuxml2argvdata/sound-device.args b/tests/qemuxml2argvdata/sound-device.args index ee8313b..f97050a 100644 --- a/tests/qemuxml2argvdata/sound-device.args +++ b/tests/qemuxml2argvdata/sound-device.args @@ -33,10 +33,12 @@ server,nowait \ -device intel-hda,id=sound5,bus=pci.0,addr=0x6 \ -device hda-micro,id=sound5-codec0,bus=sound5.0,cad=0 \ -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 hda-duplex,id=sound6-codec0,bus=sound6.0,cad=0 \ -device ich9-intel-hda,id=sound7,bus=pci.0,addr=0x8 \ -device hda-micro,id=sound7-codec0,bus=sound7.0,cad=0 \ -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 virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x9 diff --git a/tests/qemuxml2argvdata/sound-device.xml b/tests/qemuxml2argvdata/sound-device.xml index bceb9d1..c544e93 100644 --- a/tests/qemuxml2argvdata/sound-device.xml +++ b/tests/qemuxml2argvdata/sound-device.xml @@ -32,11 +32,13 @@ <sound model='ich6'> <codec type='micro'/> <codec type='duplex'/> + <codec type='output'/> </sound> <sound model='ich9'/> <sound model='ich9'> <codec type='micro'/> <codec type='duplex'/> + <codec type='output'/> </sound> <sound model='usb'/> <memballoon model='virtio'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 78454ac..e2eec96 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1515,6 +1515,7 @@ mymain(void) DO_TEST("sound", NONE); DO_TEST("sound-device", QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_HDA_MICRO, + QEMU_CAPS_HDA_OUTPUT, QEMU_CAPS_DEVICE_ICH9_INTEL_HDA, QEMU_CAPS_OBJECT_USB_AUDIO); DO_TEST("fs9p", NONE); diff --git a/tests/qemuxml2xmloutdata/sound-device.xml b/tests/qemuxml2xmloutdata/sound-device.xml index 62336a8..cbf4d17 100644 --- a/tests/qemuxml2xmloutdata/sound-device.xml +++ b/tests/qemuxml2xmloutdata/sound-device.xml @@ -43,6 +43,7 @@ <sound model='ich6'> <codec type='micro'/> <codec type='duplex'/> + <codec type='output'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </sound> <sound model='ich9'> @@ -51,6 +52,7 @@ <sound model='ich9'> <codec type='micro'/> <codec type='duplex'/> + <codec type='output'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> </sound> <sound model='usb'/> -- 2.17.0