qemu: deprecate QEMU_CAPS_VNC_SHARE_POLICY

Implied by QEMU >= 1.2.0.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NAndrea Bolognani <abologna@redhat.com>

src/qemu/qemu_capabilities.c

@@ -3625,7 +3625,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DISPLAY);
 }

src/qemu/qemu_capabilities.h

@@ -258,7 +258,7 @@ typedef enum {
     QEMU_CAPS_REALTIME_MLOCK, /* -realtime mlock=on|off */
 
     /* 150 */
-    QEMU_CAPS_VNC_SHARE_POLICY, /* set display sharing policy */
+    X_QEMU_CAPS_VNC_SHARE_POLICY, /* set display sharing policy */
     QEMU_CAPS_DEVICE_DEL_EVENT, /* DEVICE_DELETED event */
     QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, /* -device i82801b11-bridge */
     QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, /* i440FX-pcihost.pci-hole64-size */

src/qemu/qemu_command.c

@@ -7648,13 +7648,6 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
     }
 
     if (graphics->data.vnc.sharePolicy) {
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("vnc display sharing policy is not "
-                             "supported with this QEMU"));
-            goto error;
-        }
-
         virBufferAsprintf(&opt, ",share=%s",
                           virDomainGraphicsVNCSharePolicyTypeToString(
                               graphics->data.vnc.sharePolicy));

tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml

@@ -77,7 +77,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>

tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml

@@ -77,7 +77,6 @@
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml

@@ -78,7 +78,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml

@@ -80,7 +80,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml

@@ -62,7 +62,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>

tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml

@@ -62,7 +62,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml

@@ -44,7 +44,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>

tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml

@@ -80,7 +80,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml

@@ -44,7 +44,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>

tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml

@@ -62,7 +62,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>

tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml

@@ -62,7 +62,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml

@@ -44,7 +44,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>

tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml

@@ -78,7 +78,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml

@@ -80,7 +80,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml

@@ -80,7 +80,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml

@@ -64,7 +64,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>

tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml

@@ -62,7 +62,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml

@@ -80,7 +80,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml

@@ -44,7 +44,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>

tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml

@@ -80,7 +80,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml

@@ -44,7 +44,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>

tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml

@@ -80,7 +80,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml

@@ -61,7 +61,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml

@@ -44,7 +44,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>

tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml

@@ -80,7 +80,6 @@
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='vnc-share-policy'/>
   <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

tests/qemuxml2argvtest.c

@@ -1071,7 +1071,7 @@ mymain(void)
     DO_TEST("graphics-vnc-socket", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
     DO_TEST("graphics-vnc-websocket", QEMU_CAPS_VNC, QEMU_CAPS_VNC_WEBSOCKET,
             QEMU_CAPS_DEVICE_CIRRUS_VGA);
-    DO_TEST("graphics-vnc-policy", QEMU_CAPS_VNC, QEMU_CAPS_VNC_SHARE_POLICY,
+    DO_TEST("graphics-vnc-policy", QEMU_CAPS_VNC,
             QEMU_CAPS_DEVICE_CIRRUS_VGA);
     DO_TEST("graphics-vnc-no-listen-attr", QEMU_CAPS_VNC,
             QEMU_CAPS_DEVICE_CIRRUS_VGA);