[libvirt] [PATCH 2/3] qemu: Drop QEMU_CAPS_CHARDEV_SPICEPORT

The capability was introduced in QEMU 1.5.0, which it's our minimum supported QEMU version these days. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 6 ------ src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 5 ----- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 3 +-- 34 files changed, 2 insertions(+), 44 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e0c847f00a..499befb2cf 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4146,12 +4146,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); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index fad223eab7..a0134493aa 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -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 */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 95d79235a4..0a353f87ba 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -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; diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 34239f1ecc..bff3d7aab5 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 17b430878e..65982d8d74 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 8d0bad6225..003eafb5e0 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index e2d3e3f55b..a914df47f2 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 73a9c46dde..af4cd3765b 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 2c9045ce2f..f468c24ac2 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index c19c47429d..3cbe7e893d 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index ac865604e5..65b3712bb9 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 55180439af..8c051025f9 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 248bd9c5db..ef43099953 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index fbee1f5049..71c3d0f53f 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 73829a191b..d638663c75 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 6ce9c3fff7..f1a154c4c4 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 43f267c312..2bded9fc38 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 597c477f72..2d66c04c16 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index ad616e16ae..f06df3838d 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 2155a2bf14..fae6487f72 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index f7e614c413..0cd8b351db 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index d264731275..1007db9a7d 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 850ac3ca8a..9124cb2079 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 35d8a3c40b..022612246b 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 385bf0b529..62ee3fcf16 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 5f2d68ca05..7bd5bba7ed 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 13ab6ecbbe..c2aa3e15ce 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index bc4b7a4802..6bd5683673 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index c585bce982..2deb2b09fa 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index b6d83c4b18..ce70bbad61 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 17e30af5f2..f6e74ee7c6 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index b29a6f43cb..b6b1bc12db 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 92f78ee82e..1d910a9679 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -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'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0b54ba6646..62486ac77b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1395,8 +1395,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", -- 2.17.1