From f79e38795ea358bae415b50ef24b5b114f4382d4 Mon Sep 17 00:00:00 2001
From: Farhan Ali <alifm@linux.vnet.ibm.com>
Date: Fri, 23 Mar 2018 13:22:41 -0400
Subject: [PATCH] qemu: Introduce capabilities for virtio input ccw devices

QEMU on S390 (since v2.11) can support virtio input ccw devices.
Introduce qemu capabilities for these devices.

Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com>
Signed-off-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
---
 src/qemu/qemu_capabilities.c                     | 8 ++++++++
 src/qemu/qemu_capabilities.h                     | 5 +++++
 tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 3 +++
 tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 3 +++
 4 files changed, 19 insertions(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index aaa04cbf0c..e54dde69ab 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -461,6 +461,11 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "machine.pseries.max-cpu-compat",
               "dump-completed",
               "virtio-gpu-ccw",
+              "virtio-keyboard-ccw",
+
+              /* 285 */
+              "virtio-mouse-ccw",
+              "virtio-tablet-ccw",
     );
 
 
@@ -1697,6 +1702,9 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
     { "isa-serial", QEMU_CAPS_DEVICE_ISA_SERIAL },
     { "pl011", QEMU_CAPS_DEVICE_PL011 },
     { "virtio-gpu-ccw", QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW },
+    { "virtio-keyboard-ccw", QEMU_CAPS_DEVICE_VIRTIO_KEYBOARD_CCW },
+    { "virtio-mouse-ccw", QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW },
+    { "virtio-tablet-ccw", QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW },
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index b4852e5e5f..3f3c29f8fb 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -445,6 +445,11 @@ typedef enum {
     QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, /* -machine pseries,max-cpu-compat= */
     QEMU_CAPS_DUMP_COMPLETED, /* DUMP_COMPLETED event */
     QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW, /* -device virtio-gpu-ccw */
+    QEMU_CAPS_DEVICE_VIRTIO_KEYBOARD_CCW, /* -device virtio-keyboard-ccw */
+
+    /* 285 */
+    QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW, /* -device virtio-mouse-ccw */
+    QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW, /* -device virtio-tablet-ccw */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 46ae5e2309..70a35ef507 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -147,6 +147,9 @@
   <flag name='iscsi.password-secret'/>
   <flag name='dump-completed'/>
   <flag name='virtio-gpu-ccw'/>
+  <flag name='virtio-keyboard-ccw'/>
+  <flag name='virtio-mouse-ccw'/>
+  <flag name='virtio-tablet-ccw'/>
   <version>2011000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>342058</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index d6d8885f77..b5b6b5b3b1 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -147,6 +147,9 @@
   <flag name='iscsi.password-secret'/>
   <flag name='dump-completed'/>
   <flag name='virtio-gpu-ccw'/>
+  <flag name='virtio-keyboard-ccw'/>
+  <flag name='virtio-mouse-ccw'/>
+  <flag name='virtio-tablet-ccw'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>
-- 
2.39.5