]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Drop QEMU_CAPS_CHARDEV_SPICEPORT
authorAndrea Bolognani <abologna@redhat.com>
Wed, 12 Sep 2018 12:38:45 +0000 (14:38 +0200)
committerAndrea Bolognani <abologna@redhat.com>
Wed, 12 Sep 2018 13:36:46 +0000 (15:36 +0200)
The capability was introduced in QEMU 1.5.0, which is our
minimum supported QEMU version these days.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
34 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
src/qemu/qemu_command.c
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
tests/qemuxml2argvtest.c

index f7753a5ac361fab8bb757cf2f6b64813efff759b..5ac15ad5b0ba614d5e4a94d3db6ebffc2be2b448 100644 (file)
@@ -4148,12 +4148,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
 
     virQEMUCapsInitQMPBasicArch(qemuCaps);
 
-    /* -chardev spiceport is supported from 1.4.0, but usable through
-     * qapi only since 1.5.0, however, it still cannot be queried
-     * for as a capability */
-    if (qemuCaps->version >= 1005000)
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT);
-
     if (qemuCaps->version >= 1006000)
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
 
index fad223eab75825e8be3db0b850d15d003ff4fbd4..a0134493aa186c8d91a87d8485a11072873eb2d0 100644 (file)
@@ -276,7 +276,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_DEVICE_PANIC, /* -device pvpanic */
     QEMU_CAPS_ENABLE_FIPS, /* -enable-fips */
     QEMU_CAPS_SPICE_FILE_XFER_DISABLE, /* -spice disable-agent-file-xfer */
-    QEMU_CAPS_CHARDEV_SPICEPORT, /* -chardev spiceport */
+    X_QEMU_CAPS_CHARDEV_SPICEPORT, /* -chardev spiceport */
 
     /* 165 */
     QEMU_CAPS_DEVICE_USB_KBD, /* -device usb-kbd */
index 95d79235a42e164e5d5cbdba69603e66f9fd455c..0a353f87bab82c33f66a871f702faf1e94ed6077 100644 (file)
@@ -5224,11 +5224,6 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
         break;
 
     case VIR_DOMAIN_CHR_TYPE_SPICEPORT:
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("spiceport not supported in this QEMU binary"));
-            goto cleanup;
-        }
         virBufferAsprintf(&buf, "spiceport,id=%s,name=%s", charAlias,
                           dev->data.spiceport.channel);
         break;
index 34239f1eccefcda51ac895c5829a94dd80e8134f..bff3d7aab5269ce0234709d9ffcf335f49564f3b 100644 (file)
@@ -74,7 +74,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='boot-strict'/>
   <flag name='pvpanic'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='usb-audio'/>
   <flag name='splash-timeout'/>
index 17b430878e66a55291baa75846b4a1e004e08993..65982d8d740901571394be502fba4811f01e6cf4 100644 (file)
@@ -78,7 +78,6 @@
   <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='usb-audio'/>
index 8d0bad6225ccadb2fba9fdfd9951ff988c66c9d0..003eafb5e0d332078cafdaa71212e1bf2b373f6a 100644 (file)
@@ -79,7 +79,6 @@
   <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='usb-audio'/>
index e2d3e3f55b443c20c37cde9ccdc1e75a0909eae0..a914df47f222ee44736b5f4fbb146d7a3ff48fde 100644 (file)
@@ -81,7 +81,6 @@
   <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index 73a9c46ddefc5b535e8085ef0b9ead8c175c129d..af4cd3765b248cbe6c7ea3e1e4c5971886ab1193 100644 (file)
@@ -62,7 +62,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='boot-strict'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index 2c9045ce2feebf5b7b07fbb9b128002a7cc3cc75..f468c24ac258ff6f2fa0a2344200b98989f802fb 100644 (file)
@@ -61,7 +61,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='boot-strict'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index c19c47429d1395ce4153039b59a35d50a0a011c4..3cbe7e893d5a823655eb7041cd8048b7177f53dc 100644 (file)
@@ -42,7 +42,6 @@
   <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
-  <flag name='spiceport'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
index ac865604e522208f69947dc0e272b6ba6a917ea9..65b3712bb9215544c25b622cbff19f70ef0ca72d 100644 (file)
@@ -81,7 +81,6 @@
   <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index 55180439afdbdf843da7170b83d87d1848ca0dd0..8c051025f97793dcc235e5472a65e003b8102b51 100644 (file)
@@ -42,7 +42,6 @@
   <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
-  <flag name='spiceport'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
index 248bd9c5db88b7ea83e2b2af8167061d6d5ba7d0..ef430999538fd4f57b84797fe109186689b0fbaa 100644 (file)
@@ -81,7 +81,6 @@
   <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index fbee1f50494a56a0321e7107e20b188c2c8dbc96..71c3d0f53f0b53d52e748f236fa9ad846f5e4bb9 100644 (file)
@@ -62,7 +62,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='boot-strict'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index 73829a191bae6612242c1c3778e9f1d2b57a31a6..d638663c75502ad1a5874d1c894c293bd8e1ef21 100644 (file)
@@ -61,7 +61,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='boot-strict'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index 6ce9c3fff7f31b2b88c99a75d04117cb5ddff40f..f1a154c4c4d1b5fc35c4e61892b611d15723067b 100644 (file)
@@ -42,7 +42,6 @@
   <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
-  <flag name='spiceport'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
index 43f267c3125ec7b50231554188a53a2179f9a4d8..2bded9fc38ee472ab9875a09f95c9284004cd337 100644 (file)
@@ -81,7 +81,6 @@
   <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index 597c477f7289638b2bdc9fa1ccbc3036de1227ab..2d66c04c16f0061b4c703672fecb44b475cafa3c 100644 (file)
@@ -81,7 +81,6 @@
   <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index ad616e16ae27d00c9056c0a0416078be84974246..f06df3838dd8c51b92e5aded94ff664c099713f1 100644 (file)
@@ -81,7 +81,6 @@
   <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index 2155a2bf140d52c9199e8382e43bc7f60a2673a0..fae6487f7260e352cce2f231c14ee3dad3921d0c 100644 (file)
@@ -64,7 +64,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='boot-strict'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index f7e614c413df6111f52289db4adf17c04bcf19c7..0cd8b351dbd327af0a86880c4023db6f297ac62d 100644 (file)
@@ -61,7 +61,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='boot-strict'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index d264731275951510230e1e3fe91bf90fec2fef5b..1007db9a7db919ad3321ab8768ccbd5970fddc61 100644 (file)
@@ -81,7 +81,6 @@
   <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index 850ac3ca8ad78b833ca380e6d648418b16dec5a4..9124cb207990939966ed66ade2e4f79eaa759624 100644 (file)
@@ -42,7 +42,6 @@
   <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
-  <flag name='spiceport'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
index 35d8a3c40b8b17a26407b410676f0958495cd1b2..022612246b6ac63d09586b6b1b15227105284995 100644 (file)
@@ -81,7 +81,6 @@
   <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index 385bf0b529908fcec170d90ce91245c34daedc21..62ee3fcf168e2a87679b0d772fdaf62c20b591bd 100644 (file)
@@ -42,7 +42,6 @@
   <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
-  <flag name='spiceport'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
index 5f2d68ca0508cd47e1172f3a423b6a0096176717..7bd5bba7ede040eb8952c96f4c498aeb2bf91eac 100644 (file)
@@ -81,7 +81,6 @@
   <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index 13ab6ecbbea9aeab2ff5acf4a53f52811e9a4deb..c2aa3e15cebc1b7bb9dc07dc1f0522f2514da35e 100644 (file)
@@ -61,7 +61,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='boot-strict'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index bc4b7a48021b4f50357d30765352f7e9f86718c4..6bd568367366096f3bf2535d3ce3eab874fc6f6d 100644 (file)
@@ -42,7 +42,6 @@
   <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
-  <flag name='spiceport'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
index c585bce98276ee1f5b72860d48c3dbc44fa82979..2deb2b09fa505c0ecc38bc17d2e63352ef232990 100644 (file)
@@ -81,7 +81,6 @@
   <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index b6d83c4b18f10853283f3388ff15d401146d7161..ce70bbad610f69790e0e368fb1c74e64101e931d 100644 (file)
@@ -60,7 +60,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='boot-strict'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index 17e30af5f2fd22a4d3c3f11f14cedbc5f6e0422c..f6e74ee7c6b80063eed338d4473f3bca2ed323c4 100644 (file)
@@ -32,7 +32,6 @@
   <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
-  <flag name='spiceport'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
index b29a6f43cbe9cae7f061aff261912d573c815f1e..b6b1bc12db72ee7285e73bdcdd326100d65cbc5b 100644 (file)
@@ -32,7 +32,6 @@
   <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
-  <flag name='spiceport'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
index 92f78ee82e50e4e6a3383261f503117894ea2ff8..1d910a9679fb437f8545bf07fd15e43c87e0d59f 100644 (file)
@@ -80,7 +80,6 @@
   <flag name='boot-strict'/>
   <flag name='pvpanic'/>
   <flag name='spice-file-xfer-disable'/>
-  <flag name='spiceport'/>
   <flag name='usb-kbd'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
index f4a2e83d455846392296bd5a5c0e43ebbdcbe386..4883b111adbcec904823b153d5ab1edb469e2235 100644 (file)
@@ -1393,8 +1393,7 @@ mymain(void)
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_DEVICE_QXL,
             QEMU_CAPS_SPICE,
-            QEMU_CAPS_DEVICE_ISA_SERIAL,
-            QEMU_CAPS_CHARDEV_SPICEPORT);
+            QEMU_CAPS_DEVICE_ISA_SERIAL);
     DO_TEST("serial-spiceport-nospice", NONE);
 
     DO_TEST("console-compat",