qemu: add capabilities for virtio input devices

Add capabilities for virtio-keyboard, virtio-mouse
and virtio-tablet devices:

name "virtio-keyboard-device", bus virtio-bus
name "virtio-keyboard-pci", bus PCI
name "virtio-mouse-device", bus virtio-bus
name "virtio-mouse-pci", bus PCI
name "virtio-tablet-device", bus virtio-bus
name "virtio-tablet-pci", bus PCI

Map both -device and -pci versions of the device to one capability.

https://bugzilla.redhat.com/show_bug.cgi?id=1231114

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 4d76c40f286ca1323b87d0facb529570b455b298..5f9aeb585e11331c0b9f34d67c867aaede1cbb4c 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -303,6 +303,10 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "incoming-defer", /* 200 */
               "virtio-gpu",
               "virtio-gpu.virgl",
+              "virtio-keyboard",
+              "virtio-mouse",
+
+              "virtio-tablet", /* 205 */
     );
 
 
@@ -1547,6 +1551,12 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
     { "virtio-net-device", QEMU_CAPS_DEVICE_VIRTIO_NET },
     { "virtio-gpu-pci", QEMU_CAPS_DEVICE_VIRTIO_GPU },
     { "virtio-gpu-device", QEMU_CAPS_DEVICE_VIRTIO_GPU },
+    { "virtio-keyboard-device", QEMU_CAPS_VIRTIO_KEYBOARD },
+    { "virtio-keyboard-pci", QEMU_CAPS_VIRTIO_KEYBOARD },
+    { "virtio-mouse-device", QEMU_CAPS_VIRTIO_MOUSE },
+    { "virtio-mouse-pci", QEMU_CAPS_VIRTIO_MOUSE },
+    { "virtio-tablet-device", QEMU_CAPS_VIRTIO_TABLET },
+    { "virtio-tablet-pci", QEMU_CAPS_VIRTIO_TABLET },
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = {

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index ab711ff99bf0972a2ca8963f84e663f17cff9cc6..c62eeae88fe5287720859272e47d2781d05dc4fb 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -329,6 +329,11 @@ typedef enum {
     QEMU_CAPS_INCOMING_DEFER, /* -incoming defer and migrate_incoming */
     QEMU_CAPS_DEVICE_VIRTIO_GPU, /* -device virtio-gpu-* & virtio-vga */
     QEMU_CAPS_DEVICE_VIRTIO_GPU_VIRGL, /* -device virtio-gpu-*.virgl */
+    QEMU_CAPS_VIRTIO_KEYBOARD, /* -device virtio-keyboard-{device,pci} */
+    QEMU_CAPS_VIRTIO_MOUSE, /* -device virtio-mouse-{device,pci} */
+
+    /* 205 */
+    QEMU_CAPS_VIRTIO_TABLET, /* -device virtio-tablet-{device,pci} */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
index 82b1df1e1bc4df3fd2af57d646bccc2475eb658d..7cc2e2e59a6f651f628aa7c8a7c5bca35fa61a21 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
@@ -163,4 +163,7 @@
     <flag name='virtio-net'/>
     <flag name='incoming-defer'/>
     <flag name='virtio-gpu'/>
+    <flag name='virtio-keyboard'/>
+    <flag name='virtio-mouse'/>
+    <flag name='virtio-tablet'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
index 975ed0c78cc75713fd8c82d12b3f6ee641aceaa5..4f28cab4705318dd7bc01573e807f0b380060f6c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
@@ -164,4 +164,7 @@
     <flag name='incoming-defer'/>
     <flag name='virtio-gpu'/>
     <flag name='virtio-gpu.virgl'/>
+    <flag name='virtio-keyboard'/>
+    <flag name='virtio-mouse'/>
+    <flag name='virtio-tablet'/>
   </qemuCaps>