]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: deprecate QEMU_CAPS_VNC_SHARE_POLICY
authorJán Tomko <jtomko@redhat.com>
Thu, 29 Mar 2018 10:51:55 +0000 (12:51 +0200)
committerJán Tomko <jtomko@redhat.com>
Tue, 17 Apr 2018 12:37:50 +0000 (14:37 +0200)
Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
29 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.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/qemuxml2argvtest.c

index dcbd3c80f501336fc7ae29ca2e81dd2ca0248fbb..355ff3958e7b6ac15161d5f330d6a76245edb0ee 100644 (file)
@@ -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);
 }
index 6048d7d6c86c8d501679fc93d6695c46befbd7a6..2cedffce66a80cf9ce89f6f1b0abe59ab9183af7 100644 (file)
@@ -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 */
index d665d52897f27fef7b513a1a733ae73af8c207ab..f54230e067e4c3834c34c7ccc3fa8833d2a91220 100644 (file)
@@ -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));
index 779f5032b17996762368f5f882a28567d278c58b..cc1687237fb9b926b4c2a84e9838ca6ae49a5de8 100644 (file)
@@ -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'/>
index a2076c7a5ade1a48781429a02e976a659d8727d8..70de6f5d6f2e3b51915430d81c986d3d32e9ca3a 100644 (file)
@@ -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'/>
index f57088701b86012a5074616509010a56ad99dd73..e2528f10d450e469352c2cfef953e9b6056d0760 100644 (file)
@@ -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'/>
index 8d8636655f1b66512b3639e681ef8be1ff8d3460..91824d73719c3f89721090483886d59e61b25856 100644 (file)
@@ -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'/>
index 0a6205b408ff4333ac2151792d813950273f0d44..c7490dd5316996a217c8111839bb6d65e2b9b9e8 100644 (file)
@@ -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'/>
index af45fc2f4c6fb0de3919fd4adaf3eb2b5a116da9..50709d5c98b42611a4090a38e6e62eee44206379 100644 (file)
@@ -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'/>
index 06544e673c623da68d5a5694a219ed7c4c9aba8d..2cc15206474a830a590861a27c2e5e7209df54fe 100644 (file)
@@ -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'/>
index 09f5e314152771442b288f75b18cb7d88bc79872..c2d579ece07207b3659384e8d0842b92adc2f9f8 100644 (file)
@@ -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'/>
index 8d97bee25a59bad2eba504288b3e2f1fc9acc8fc..dd89fcd38a8a79e2ce6f44651b1b25d6d2c1b7ae 100644 (file)
@@ -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'/>
index 528c5031f5834a16b7d9d05f525f80a79e13e784..9cb538320b62bb49c75c55c9ecc04a1f91292131 100644 (file)
@@ -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'/>
index e902ccb86564668f341bbf4a5c83e1754a3d4899..1b7b405de208c92b1824dc9fd16b3299381926c3 100644 (file)
@@ -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'/>
index 2098743adef2fa6a3383edaa72e0141309ff2da9..a86a12df3b012b2b9586452ba524d9d7209de363 100644 (file)
@@ -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'/>
index fa4b5be9ea3ecfecf061ac259baa4dfd689e5330..d0dc506c684781bd605e6bff09fb5341a5610187 100644 (file)
@@ -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'/>
index ee1bdfaa0c739011c6b7db6493a34229c1b55c77..74b831442c6ebf884004e014932c3364d7be404b 100644 (file)
@@ -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'/>
index 28689bb7667fa6b0f53494fda80d1dd4faf16ad9..2248546c6772d3b770b365dc91e0fe41fb5ce754 100644 (file)
@@ -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'/>
index 89022c2400bff1526edc91191577052063dabb5a..a23ecdf24f23a158678bbefee9808b5b83ba32bc 100644 (file)
@@ -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'/>
index e07951b126a93978f9abed259a6f45797ed0dd99..dc70b02a3475777656bfc98a40825c90453993e5 100644 (file)
@@ -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'/>
index b83cff919253d9f1a868c0e25e7ee323bb6da72b..fb8734fceb4c42342533d23bd2ac800c4818994d 100644 (file)
@@ -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'/>
index b03ef2709e7e548b77723269c5d41c96c1f49559..cb525a064388106368a8ac17d376486efff62836 100644 (file)
@@ -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'/>
index e9944e63c8a240f230d9840c967800c2bc6321ae..fdc46175df2a478ea84dcc375bb360fc33709a74 100644 (file)
@@ -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'/>
index c2e12ce32316f6290e1ea699282544306182f0b9..9538b544942f574a07925fe9b90218b01cfe069d 100644 (file)
@@ -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'/>
index 07b8c7b9f267c6484d4b807beffcf4ea733101ba..22c0ad12e7d30247bcacffee094332dcb5dfd86c 100644 (file)
@@ -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'/>
index 5873af49dd339b328d0c29f2d0c7928eaec3277e..c8b14b40be5c95c85b3ea4ebd35ca1399e59a1a2 100644 (file)
@@ -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'/>
index c5560a62a7b54a3706f31bb9d0076b3744a2479a..d06bd702e253c0d07cabd662d30b96fd55f94b4c 100644 (file)
@@ -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'/>
index f0525971f1eab3227cde992baa5ea441fe052c4b..cb6014459d5189a9c09793e59ca1e6c39cb3e9c2 100644 (file)
@@ -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'/>
index dafd76af67a02bcbc70cc9a14bf21b3d026b64cb..22719119838c553bf3b75bfccbcc600f9d9b0a78 100644 (file)
@@ -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);