openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: Drop QEMU_CAPS_VNC_WEBSOCKET 

The capability was introduced in QEMU 1.3.1 and we require
QEMU 1.5.0 these days.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Andrea Bolognani 2018-09-12 14:29:13 +02:00
parent b64b14cf8e
commit d6a1d0af62
34 changed files with 4 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_capabilities.c
View File

@ -4148,10 +4148,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
virQEMUCapsInitQMPBasicArch(qemuCaps);
/* WebSockets were introduced between 1.3.0 and 1.3.1 */
if (qemuCaps->version >= 1003001)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_WEBSOCKET);
/* -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 */

2
src/qemu/qemu_capabilities.h
View File

@ -253,7 +253,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
/* 145 */
X_QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX, /* -device scsi-generic.bootindex */
QEMU_CAPS_MEM_MERGE, /* -machine mem-merge */
QEMU_CAPS_VNC_WEBSOCKET, /* -vnc x:y,websocket */
X_QEMU_CAPS_VNC_WEBSOCKET, /* -vnc x:y,websocket */
QEMU_CAPS_DRIVE_DISCARD, /* -drive discard=off(ignore)|on(unmap) */
QEMU_CAPS_REALTIME_MLOCK, /* -realtime mlock=on|off */

9
src/qemu/qemu_command.c
View File

@ -7843,15 +7843,8 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
virBufferAsprintf(&opt, ":%d",
graphics->data.vnc.port - 5900);
if (graphics->data.vnc.websocket) {
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_WEBSOCKET)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("VNC WebSockets are not supported "
"with this QEMU binary"));
goto error;
}
if (graphics->data.vnc.websocket)
virBufferAsprintf(&opt, ",websocket=%d", graphics->data.vnc.websocket);
}
break;
case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE:

1
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
View File

@ -64,7 +64,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
View File

@ -65,7 +65,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='mlock'/>
<flag name='device-del-event'/>
<flag name='dmi-to-pci-bridge'/>

1
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
View File

@ -65,7 +65,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
View File

@ -67,7 +67,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
View File

@ -53,7 +53,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
View File

@ -53,7 +53,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
View File

@ -37,7 +37,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
View File

@ -67,7 +67,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
View File

@ -37,7 +37,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
View File

@ -67,7 +67,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
View File

@ -53,7 +53,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
View File

@ -53,7 +53,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
View File

@ -37,7 +37,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
View File

@ -67,7 +67,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
View File

@ -67,7 +67,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
View File

@ -67,7 +67,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
View File

@ -55,7 +55,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
View File

@ -53,7 +53,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
View File

@ -67,7 +67,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
View File

@ -37,7 +37,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
View File

@ -67,7 +67,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
View File

@ -37,7 +37,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
View File

@ -67,7 +67,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
View File

@ -53,7 +53,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
View File

@ -37,7 +37,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
View File

@ -67,7 +67,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
View File

@ -53,7 +53,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
View File

@ -27,7 +27,6 @@
<flag name='tpm-passthrough'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
View File

@ -27,7 +27,6 @@
<flag name='tpm-passthrough'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
View File

@ -67,7 +67,6 @@
<flag name='vfio-pci'/>
<flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='vnc-websocket'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
<flag name='device-del-event'/>

3
tests/qemuxml2argvtest.c
View File

@ -1233,7 +1233,8 @@ mymain(void)
DO_TEST("graphics-vnc", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
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,
DO_TEST("graphics-vnc-websocket",
QEMU_CAPS_VNC,
QEMU_CAPS_DEVICE_CIRRUS_VGA);
DO_TEST("graphics-vnc-policy", QEMU_CAPS_VNC,
QEMU_CAPS_DEVICE_CIRRUS_VGA);