qemu_capabilities: Add QEMU_CAPS_INPUT_LINUX

Signed-off-by: Kristina Hanicova <khanicov@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2025-01-09 01:18:00 +03:00 · 2021-05-21 13:01:06 +02:00 · 2021-05-21 13:01:06 +02:00 · 3bfbc3c0ef
commit 3bfbc3c0ef
parent 93344aed27
40 changed files with 41 additions and 0 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -629,6 +629,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              /* 400 */
              "compat-deprecated",
              "acpi-index",
+              "input-linux",
    );


@ -1347,6 +1348,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
    { "am53c974", QEMU_CAPS_SCSI_AM53C974 },
    { "virtio-pmem-pci", QEMU_CAPS_DEVICE_VIRTIO_PMEM_PCI },
    { "vhost-user-blk", QEMU_CAPS_DEVICE_VHOST_USER_BLK },
+    { "input-linux", QEMU_CAPS_INPUT_LINUX },
 };


--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -609,6 +609,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    /* 400 */
    QEMU_CAPS_COMPAT_DEPRECATED, /* -compat deprecated-(input|output) is supported */
    QEMU_CAPS_ACPI_INDEX, /* PCI device 'acpi-index' property */
+    QEMU_CAPS_INPUT_LINUX, /* -object input-linux */

    QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@ -112,6 +112,7 @@
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='fsdev.createmode'/>
  <flag name='vnc-opts'/>
+  <flag name='input-linux'/>
  <version>2011000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100288</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@ -193,6 +193,7 @@
  <flag name='am53c974'/>
  <flag name='cpu-max'/>
  <flag name='vnc-opts'/>
+  <flag name='input-linux'/>
  <version>2011000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100288</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@ -161,6 +161,7 @@
  <flag name='cpu-max'/>
  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>2012000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700289</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@ -160,6 +160,7 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='vnc-opts'/>
+  <flag name='input-linux'/>
  <version>2011090</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900289</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@ -125,6 +125,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='vhost-user-blk'/>
  <flag name='vnc-opts'/>
+  <flag name='input-linux'/>
  <version>2012000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100289</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@ -204,6 +204,7 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='vnc-opts'/>
+  <flag name='input-linux'/>
  <version>2011090</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100289</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@ -162,6 +162,7 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='vnc-opts'/>
+  <flag name='input-linux'/>
  <version>2012050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900239</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@ -95,6 +95,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='vhost-user-blk'/>
  <flag name='vnc-opts'/>
+  <flag name='input-linux'/>
  <version>3000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@ -95,6 +95,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='vhost-user-blk'/>
  <flag name='vnc-opts'/>
+  <flag name='input-linux'/>
  <version>3000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@ -128,6 +128,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='vhost-user-blk'/>
  <flag name='vnc-opts'/>
+  <flag name='input-linux'/>
  <version>3000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100239</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@ -210,6 +210,7 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='vnc-opts'/>
+  <flag name='input-linux'/>
  <version>3000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100239</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@ -167,6 +167,7 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='vnc-opts'/>
+  <flag name='input-linux'/>
  <version>3000091</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@ -213,6 +213,7 @@
  <flag name='vhost-user-blk'/>
  <flag name='cpu-max'/>
  <flag name='vnc-opts'/>
+  <flag name='input-linux'/>
  <version>3000092</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@ -176,6 +176,7 @@
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@ -183,6 +183,7 @@
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@ -175,6 +175,7 @@
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@ -175,6 +175,7 @@
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@ -139,6 +139,7 @@
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@ -221,6 +221,7 @@
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@ -228,6 +228,7 @@
  <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>4001000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -191,6 +191,7 @@
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>4001050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -190,6 +190,7 @@
  <flag name='vnc-opts'/>
  <flag name='audiodev'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>4001050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -152,6 +152,7 @@
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>4002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -239,6 +239,7 @@
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>4002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -201,6 +201,7 @@
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -209,6 +209,7 @@
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -195,6 +195,7 @@
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -246,6 +246,7 @@
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -110,6 +110,7 @@
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>5001000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -248,6 +248,7 @@
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>5001000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -205,6 +205,7 @@
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -211,6 +211,7 @@
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -197,6 +197,7 @@
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -159,6 +159,7 @@
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -249,6 +249,7 @@
  <flag name='audiodev'/>
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
+  <flag name='input-linux'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -164,6 +164,7 @@
  <flag name='rotation-rate'/>
  <flag name='compat-deprecated'/>
  <flag name='acpi-index'/>
+  <flag name='input-linux'/>
  <version>6000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -254,6 +254,7 @@
  <flag name='rotation-rate'/>
  <flag name='compat-deprecated'/>
  <flag name='acpi-index'/>
+  <flag name='input-linux'/>
  <version>6000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -253,6 +253,7 @@
  <flag name='rotation-rate'/>
  <flag name='compat-deprecated'/>
  <flag name='acpi-index'/>
+  <flag name='input-linux'/>
  <version>6000050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100243</microcodeVersion>