qemu: capabilities: Retire QEMU_CAPS_VNC_MULTI_SERVERS

Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2025-01-27 18:03:50 +03:00 · 2021-09-23 09:26:41 +02:00 · 2021-09-23 09:26:41 +02:00 · 41763b6cfa
commit 41763b6cfa
parent c94c76c4e6
41 changed files with 2 additions and 42 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -435,7 +435,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              "loadparm", /* QEMU_CAPS_LOADPARM */
              "spapr-pci-host-bridge", /* QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE */
              "spapr-pci-host-bridge.numa_node", /* QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE */
-              "vnc-multi-servers", /* QEMU_CAPS_VNC_MULTI_SERVERS */
+              "vnc-multi-servers", /* X_QEMU_CAPS_VNC_MULTI_SERVERS */

              /* 265 */
              "virtio-net.tx_queue_size", /* QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE */
@ -3214,7 +3214,6 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
    { "spice", "gl", QEMU_CAPS_SPICE_GL },
    { "spice", "unix", QEMU_CAPS_SPICE_UNIX },
    { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE },
-    { "vnc", "vnc", QEMU_CAPS_VNC_MULTI_SERVERS },
    { "vnc", "power-control", QEMU_CAPS_VNC_POWER_CONTROL },
    { "vnc", "audiodev", QEMU_CAPS_AUDIODEV },
 };
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -415,7 +415,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    QEMU_CAPS_LOADPARM, /* -machine loadparm */
    QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, /* -device spapr-pci-host-bridge */
    QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE, /* spapr-pci-host-bridge.numa_node= */
-    QEMU_CAPS_VNC_MULTI_SERVERS, /* -vnc vnc=unix:/path */
+    X_QEMU_CAPS_VNC_MULTI_SERVERS, /* -vnc vnc=unix:/path */

    /* 265 */
    QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, /* virtio-net-*.tx_queue_size */
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@ -66,7 +66,6 @@
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='loadparm'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@ -139,7 +139,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@ -100,7 +100,6 @@
  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@ -96,7 +96,6 @@
  <flag name='virtio.ats'/>
  <flag name='spapr-pci-host-bridge'/>
  <flag name='spapr-pci-host-bridge.numa_node'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@ -66,7 +66,6 @@
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='loadparm'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@ -136,7 +136,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@ -95,7 +95,6 @@
  <flag name='virtio.ats'/>
  <flag name='spapr-pci-host-bridge'/>
  <flag name='spapr-pci-host-bridge.numa_node'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@ -46,7 +46,6 @@
  <flag name='query-named-block-nodes'/>
  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
  <flag name='vxhs'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@ -46,7 +46,6 @@
  <flag name='query-named-block-nodes'/>
  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
  <flag name='vxhs'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@ -68,7 +68,6 @@
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='loadparm'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@ -138,7 +138,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@ -96,7 +96,6 @@
  <flag name='virtio.ats'/>
  <flag name='spapr-pci-host-bridge'/>
  <flag name='spapr-pci-host-bridge.numa_node'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@ -138,7 +138,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@ -102,7 +102,6 @@
  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@ -102,7 +102,6 @@
  <flag name='virtio.ats'/>
  <flag name='spapr-pci-host-bridge'/>
  <flag name='spapr-pci-host-bridge.numa_node'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@ -107,7 +107,6 @@
  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@ -107,7 +107,6 @@
  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@ -68,7 +68,6 @@
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='loadparm'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@ -137,7 +137,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@ -137,7 +137,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -104,7 +104,6 @@
  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -102,7 +102,6 @@
  <flag name='virtio.ats'/>
  <flag name='spapr-pci-host-bridge'/>
  <flag name='spapr-pci-host-bridge.numa_node'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -68,7 +68,6 @@
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='loadparm'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -138,7 +138,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -106,7 +106,6 @@
  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -104,7 +104,6 @@
  <flag name='virtio.ats'/>
  <flag name='spapr-pci-host-bridge'/>
  <flag name='spapr-pci-host-bridge.numa_node'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -107,7 +107,6 @@
  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -138,7 +138,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -40,7 +40,6 @@
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
  <flag name='kernel-irqchip'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='chardev-reconnect'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -138,7 +138,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -106,7 +106,6 @@
  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -103,7 +103,6 @@
  <flag name='virtio.ats'/>
  <flag name='spapr-pci-host-bridge'/>
  <flag name='spapr-pci-host-bridge.numa_node'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -106,7 +106,6 @@
  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -67,7 +67,6 @@
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='loadparm'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -138,7 +138,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@ -107,7 +107,6 @@
  <flag name='kernel-irqchip'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -67,7 +67,6 @@
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
  <flag name='loadparm'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -137,7 +137,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -136,7 +136,6 @@
  <flag name='intel-iommu.device-iotlb'/>
  <flag name='virtio.iommu_platform'/>
  <flag name='virtio.ats'/>
-  <flag name='vnc-multi-servers'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
  <flag name='virtio-gpu.max_outputs'/>