This commit adds test coverage for the multitouch input device feature. Updated test files to get this new capability working with other input devices: - tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml: Adds the QEMU_CAPS_VIRTIO_MULTITOUCH capability to the QEMU 10.2.0 capability test data, indicating that this QEMU version supports multitouch devices. - tests/qemuxmlconfdata/virtio-input.xml: Adds a multitouch input device definition to the virtio-input test case, providing an example of proper XML syntax. - tests/qemuxmlconfdata/virtio-input.x86_64-latest.xml: Updates the expected parsed XML output to include the multitouch device configuration. - tests/qemuxmlconfdata/virtio-input.x86_64-latest.args: Updates the expected QEMU command-line arguments to include the virtio-multitouch-pci device, validating that libvirt correctly translates the XML into QEMU arguments. Signed-off-by: Julio Faracco <jcfaracco@gmail.com> --- tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml | 1 + tests/qemuxmlconfdata/virtio-input.x86_64-latest.args | 1 + tests/qemuxmlconfdata/virtio-input.x86_64-latest.xml | 3 +++ tests/qemuxmlconfdata/virtio-input.xml | 1 + 4 files changed, 6 insertions(+) diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml index 06f7bf784d..d718aec43a 100644 --- a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml @@ -64,6 +64,7 @@ <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> + <flag name='virtio-multitouch'/> <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> diff --git a/tests/qemuxmlconfdata/virtio-input.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-input.x86_64-latest.args index 20439c7de1..9f1747f509 100644 --- a/tests/qemuxmlconfdata/virtio-input.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-input.x86_64-latest.args @@ -30,6 +30,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtio-mouse-pci","id":"input0","bus":"pci.0","addr":"0x3"}' \ -device '{"driver":"virtio-keyboard-pci","id":"input1","bus":"pci.0","addr":"0xa"}' \ -device '{"driver":"virtio-tablet-pci","id":"input2","bus":"pci.0","addr":"0x4"}' \ +-device '{"driver":"virtio-multitouch-pci","id":"input3","bus":"pci.0","addr":"0x5"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxmlconfdata/virtio-input.x86_64-latest.xml b/tests/qemuxmlconfdata/virtio-input.x86_64-latest.xml index e9c7a3676c..ff7b142cdd 100644 --- a/tests/qemuxmlconfdata/virtio-input.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/virtio-input.x86_64-latest.xml @@ -30,6 +30,9 @@ <input type='tablet' bus='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </input> + <input type='multitouch' bus='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </input> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <audio id='1' type='none'/> diff --git a/tests/qemuxmlconfdata/virtio-input.xml b/tests/qemuxmlconfdata/virtio-input.xml index 6f07f7b8df..0c9a854243 100644 --- a/tests/qemuxmlconfdata/virtio-input.xml +++ b/tests/qemuxmlconfdata/virtio-input.xml @@ -21,6 +21,7 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> </input> <input type='tablet' bus='virtio'/> + <input type='multitouch' bus='virtio'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <memballoon model='virtio'/> -- 2.52.0