qemu: Add QEMU_CAPS_DEVICE_ISA_SERIAL

All serial devices shoule have an associated capability.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index f2d24a30994fd6bcd177ad6a760c43f12b2e26e9..cd519cb3cdb5695b47826c3013ba5e8a1100c8e3 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -452,6 +452,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "numa.dist",
               "disk-share-rw",
               "iscsi.password-secret",
+              "isa-serial",
     );
 
 
@@ -1682,6 +1683,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
     { "vmcoreinfo", QEMU_CAPS_DEVICE_VMCOREINFO },
     { "spapr-vty", QEMU_CAPS_DEVICE_SPAPR_VTY },
     { "sclplmconsole", QEMU_CAPS_DEVICE_SCLPLMCONSOLE },
+    { "isa-serial", QEMU_CAPS_DEVICE_ISA_SERIAL },
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = {

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 68a2541d30e6edd9e4a219c1535aee88e56b8505..fc043b07522fc4c024c65115ec8aa7cb16065b5e 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -438,6 +438,7 @@ typedef enum {
     QEMU_CAPS_NUMA_DIST, /* -numa dist */
     QEMU_CAPS_DISK_SHARE_RW, /* share-rw=on for concurrent disk access */
     QEMU_CAPS_ISCSI_PASSWORD_SECRET, /* -drive file.driver=iscsi,...,password-secret= */
+    QEMU_CAPS_DEVICE_ISA_SERIAL, /* -device isa-serial */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;

diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
index 956284d5d3c56e425d1e800d79ebcc153a0a3428..d560811ab73feda089cc5a346f4578f08e0b8f77 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
@@ -109,6 +109,7 @@
   <flag name='device-tray-moved-event'/>
   <flag name='display'/>
   <flag name='query-cpu-definitions'/>
+  <flag name='isa-serial'/>
   <version>1002002</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
index 99384ce5e64b1d5051c03aa777c7dbcc8f1ed21e..576475f7fa35ca90248ad09514bf6b5c7f0435fa 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
@@ -127,6 +127,7 @@
   <flag name='nec-usb-xhci-ports'/>
   <flag name='display'/>
   <flag name='query-cpu-definitions'/>
+  <flag name='isa-serial'/>
   <version>1003001</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
index aea043c57d5c8d732f0736f0f270bc08016a6fde..0c271d3e41a9396d0888d6b0adfb7253fde59aad 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
@@ -128,6 +128,7 @@
   <flag name='nec-usb-xhci-ports'/>
   <flag name='display'/>
   <flag name='query-cpu-definitions'/>
+  <flag name='isa-serial'/>
   <version>1004002</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 6f860e4f2597870512671418ec68e5ddefa21c19..5c667975bf429bb2889668e6043d14985da506d4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -140,6 +140,7 @@
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-definitions'/>
   <flag name='kernel-irqchip'/>
+  <flag name='isa-serial'/>
   <version>1005003</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index e5dc8360de6a0a1825c95eeeb51e9bc9581750e1..8ae07a91db40cf1bf0f16f721e087e2732a50fdc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -145,6 +145,7 @@
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-definitions'/>
   <flag name='kernel-irqchip'/>
+  <flag name='isa-serial'/>
   <version>1006000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index 86d87eaf0c700e4cd8fb19758b5b128496765130..34bd6be1cd66f9a78b209b56587a034b71aa2c09 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -147,6 +147,7 @@
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-definitions'/>
   <flag name='kernel-irqchip'/>
+  <flag name='isa-serial'/>
   <version>1007000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 2fa551b1a07d4733a208dfe20ef18fc28b7e22ac..0d7c144ff7806f253a11abaeb1b83c52ad5f3ccf 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -163,6 +163,7 @@
   <flag name='query-cpu-definitions'/>
   <flag name='query-named-block-nodes'/>
   <flag name='kernel-irqchip'/>
+  <flag name='isa-serial'/>
   <version>2001001</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml
index 96b42bbe91dcbc167a32da0b76797364fe194f53..b4dc8f1967599e2823e3cb9f3c5d7eb56264ded8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml
@@ -183,6 +183,7 @@
   <flag name='numa.dist'/>
   <flag name='disk-share-rw'/>
   <flag name='iscsi.password-secret'/>
+  <flag name='isa-serial'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.10.0)</package>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml
index 79866a0259d711de1230bdf280c67a28bfb215b9..f2f5989672f4c3d9dd76ef48587efcc991ee4d76 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml
@@ -183,6 +183,7 @@
   <flag name='numa.dist'/>
   <flag name='disk-share-rw'/>
   <flag name='iscsi.password-secret'/>
+  <flag name='isa-serial'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.10.0)</package>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 5f97bc3932e6fa3b6c86d485b50f62ceaf436a27..ca55e11ebebc938745b689702bf1e4b260632bf8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -182,6 +182,7 @@
   <flag name='numa.dist'/>
   <flag name='disk-share-rw'/>
   <flag name='iscsi.password-secret'/>
+  <flag name='isa-serial'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.10.0)</package>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index ec7f29cc1cebe24fe5b1a4613931188fcdaafbf2..8fea70a522d7ed93e8b3c514b2b36061fe9ebb67 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -227,6 +227,7 @@
   <flag name='numa.dist'/>
   <flag name='disk-share-rw'/>
   <flag name='iscsi.password-secret'/>
+  <flag name='isa-serial'/>
   <version>2010000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.10.0)</package>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index f97e4cb813395522567d75124ff17beaf97364bf..5007523c1f2bedfdae35382bf930d5c835322274 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -188,6 +188,7 @@
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
   <flag name='virtio-gpu.max_outputs'/>
+  <flag name='isa-serial'/>
   <version>2004000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 2ba40fc494335f0162aa046ce6c8321026457233..a9ad292d0145bf4eba0ac5021026de0816663b28 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -194,6 +194,7 @@
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
   <flag name='virtio-gpu.max_outputs'/>
+  <flag name='isa-serial'/>
   <version>2005000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
index 0b34fa30d47eca4b540227cd32518db30b0c776c..e699bdbafdf5d2ba0ff3acb8ac1c49b0aa590fc4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
@@ -172,6 +172,7 @@
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
   <flag name='virtio-gpu.max_outputs'/>
+  <flag name='isa-serial'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
index d41d578c7e2a745c9bf5aeebcb5811aa2c65a452..f4c1de7e1da9715cff88e1875d0b7a1f8141ec4a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
@@ -172,6 +172,7 @@
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
   <flag name='virtio-gpu.max_outputs'/>
+  <flag name='isa-serial'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index 5ff8598fc810a2db4c25eeb04ce8dd601405bb98..27d99bd93702ef42db95d851cbf78ec29c82077d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -168,6 +168,7 @@
   <flag name='chardev-reconnect'/>
   <flag name='virtio-gpu.max_outputs'/>
   <flag name='spapr-vty'/>
+  <flag name='isa-serial'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index bdf006f6bec06ce41464e50bec5fc5551d367b3d..97621612ab70c913664e6c37715744ad703c9beb 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -204,6 +204,7 @@
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
   <flag name='virtio-gpu.max_outputs'/>
+  <flag name='isa-serial'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 59adff6c978e3391d623585924438bca6d2d3376..e4ea9452c530471bf9a1b42c845940ea27f0b5e6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -208,6 +208,7 @@
   <flag name='chardev-reconnect'/>
   <flag name='virtio-gpu.max_outputs'/>
   <flag name='virtio-blk.num-queues'/>
+  <flag name='isa-serial'/>
   <version>2007000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.7.0)</package>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 3165b2dee33bdff3f939d529225e3179e942c377..c6d3e21d5c1b7edaebf0e332c11c6a5fcfc14292 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -210,6 +210,7 @@
   <flag name='chardev-reconnect'/>
   <flag name='virtio-gpu.max_outputs'/>
   <flag name='virtio-blk.num-queues'/>
+  <flag name='isa-serial'/>
   <version>2008000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.8.0)</package>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 4e712f69ebfc317b342b5e85a6c1cef90d36d6f5..96aa5d59fcc45ed5f0cf770858d53d1f95de04ab 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -176,6 +176,7 @@
   <flag name='spapr-vty'/>
   <flag name='disk-share-rw'/>
   <flag name='iscsi.password-secret'/>
+  <flag name='isa-serial'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.9.0)</package>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 4e8079d8fd4e8079921842a52c4b04516d4961c9..9f489129fbed79e9a4ba40ed91c35aa25fe90e9c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -223,6 +223,7 @@
   <flag name='virtio-blk.num-queues'/>
   <flag name='disk-share-rw'/>
   <flag name='iscsi.password-secret'/>
+  <flag name='isa-serial'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.9.0)</package>

diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index 2280e96a3eca56c8aed106d5503bcf5c24e27f0b..1336eeef5e6f1ca02ad559779d5d6b47a275a971 100644 (file)
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -174,6 +174,7 @@ mymain(void)
             QEMU_CAPS_DEVICE_USB_KBD,
             QEMU_CAPS_DEVICE_RTL8139,
             QEMU_CAPS_DEVICE_E1000,
+            QEMU_CAPS_DEVICE_ISA_SERIAL,
             QEMU_CAPS_DEVICE_VIRTIO_NET);
     DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0,
             QEMU_CAPS_DRIVE_BOOT,
@@ -210,6 +211,7 @@ mymain(void)
             QEMU_CAPS_DEVICE_USB_KBD,
             QEMU_CAPS_DEVICE_RTL8139,
             QEMU_CAPS_DEVICE_E1000,
+            QEMU_CAPS_DEVICE_ISA_SERIAL,
             QEMU_CAPS_DEVICE_VIRTIO_NET);
     DO_TEST("qemu-kvm-0.13.0", 13000, 1, 0,
             QEMU_CAPS_DRIVE_BOOT,
@@ -258,6 +260,7 @@ mymain(void)
             QEMU_CAPS_DEVICE_IVSHMEM,
             QEMU_CAPS_DEVICE_RTL8139,
             QEMU_CAPS_DEVICE_E1000,
+            QEMU_CAPS_DEVICE_ISA_SERIAL,
             QEMU_CAPS_DEVICE_VIRTIO_NET);
     DO_TEST("qemu-1.0", 1000000, 0, 0,
             QEMU_CAPS_DRIVE_CACHE_UNSAFE,
@@ -328,6 +331,7 @@ mymain(void)
             QEMU_CAPS_DEVICE_RTL8139,
             QEMU_CAPS_DEVICE_E1000,
             QEMU_CAPS_DEVICE_VIRTIO_NET,
+            QEMU_CAPS_DEVICE_ISA_SERIAL,
             QEMU_CAPS_DISPLAY);
     DO_TEST("qemu-1.1.0", 1001000, 0, 0,
             QEMU_CAPS_DRIVE_CACHE_UNSAFE,
@@ -411,6 +415,7 @@ mymain(void)
             QEMU_CAPS_DEVICE_RTL8139,
             QEMU_CAPS_DEVICE_E1000,
             QEMU_CAPS_DEVICE_VIRTIO_NET,
+            QEMU_CAPS_DEVICE_ISA_SERIAL,
             QEMU_CAPS_DISPLAY);
     DO_TEST_FULL("qemu-1.2.0", 1002000, 0, 0, VIR_ERR_CONFIG_UNSUPPORTED,
             QEMU_CAPS_LAST);