External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: deprecate QEMU_CAPS_VNC_SHARE_POLICY

Browse Source 
Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Ján Tomko 2018-03-29 12:51:55 +02:00
parent 84b40886f2
commit 027b7f9edf
29 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/qemu_capabilities.c
View 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);
}

2
src/qemu/qemu_capabilities.h
View 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 */

7
src/qemu/qemu_command.c
View 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));

1
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
View 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'/>

2
tests/qemuxml2argvtest.c
View 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);