On 04/30/2013 08:42 AM, Martin Kletzander wrote:
Adding a VNC WebSocket support for QEMU driver. This funcitonality
is
s/funcitonality/functionality/
in upstream qemu from commit described as v1.3.0-982-g7536ee4, so
the
capability is being recognized based on QEMU version for now.
I wish we could do better than just a version check; is there anything
we can probe in QMP, or possibly even use qemu 1.5's
query-command-line-parameters as an additional method for checking when
this has been backported to a build earlier than 1.2? At any rate,
don't let that hold up this patch; we can improve detection methods as
followup patches when (and if) a downstream distro even decides to
backport websocket support.
+++ b/src/qemu/qemu.conf
@@ -153,6 +153,13 @@
#remote_display_port_min = 5900
#remote_display_port_max = 65535
+# VNC WebSocket port policies, same rules apply as with remote display
+# ports. VNC WebSockets use similar display <-> port mappings, with
+# the exception being that ports starts from 5700 instead of 5900.
+# This is what may have be changed here.
Not sure this last sentence adds anything here.
+#
+#remote_websocket_port_min = 5700
+#remote_websocket_port_max = 65535
+++ b/src/qemu/qemu_capabilities.h
@@ -182,6 +182,7 @@ enum virQEMUCapsFlags {
QEMU_CAPS_DEVICE_PCI_BRIDGE = 141, /* -device pci-bridge */
QEMU_CAPS_DEVICE_VFIO_PCI = 142, /* -device vfio-pci */
QEMU_CAPS_VFIO_PCI_BOOTINDEX = 143, /* bootindex param for vfio-pci device */
+ QEMU_CAPS_VNC_WEBSOCKET = 144, /* bootindex param for vfio-pci device */
Comment needs fixing.
Rest of patch looks fine. ACK with problems fixed.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org