58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
|
From b149e82858eb16bcede32b86518a7a2f6f259b5b Mon Sep 17 00:00:00 2001
|
||
|
|
From: dinglimin <dinglimin@cmss.chinamobile.com>
|
||
|
|
Date: Thu, 23 May 2024 16:45:25 +0800
|
||
|
|
Subject: [PATCH] Allow UNIX socket option for VNC websocket
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
cheery-pick from 41582637b1577c261f19634bdd1bb5e7ed6e258d
|
||
|
|
|
||
|
|
- Remove unix socket option limitation for VNC websocket
|
||
|
|
- Reflect websocket option changes in documentation
|
||
|
|
|
||
|
|
Signed-off-by: Sergii Zasenko <sergii@zasenko.name>
|
||
|
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||
|
|
Message-Id: <20230724100353.16628-1-sergii@zasenko.name>
|
||
|
|
|
||
|
|
Signed-off-by: dinglimin <dinglimin@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
qemu-options.hx | 4 ++++
|
||
|
|
ui/vnc.c | 5 -----
|
||
|
|
2 files changed, 4 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/qemu-options.hx b/qemu-options.hx
|
||
|
|
index d940b4aea5..ab82ad4150 100644
|
||
|
|
--- a/qemu-options.hx
|
||
|
|
+++ b/qemu-options.hx
|
||
|
|
@@ -2339,6 +2339,10 @@ SRST
|
||
|
|
host. It is possible to control the websocket listen address
|
||
|
|
independently, using the syntax ``websocket``\ =host:port.
|
||
|
|
|
||
|
|
+ Websocket could be allowed over UNIX domain socket, using the syntax
|
||
|
|
+ ``websocket``\ =unix:path, where path is the location of a unix socket
|
||
|
|
+ to listen for connections on.
|
||
|
|
+
|
||
|
|
If no TLS credentials are provided, the websocket connection
|
||
|
|
runs in unencrypted mode. If TLS credentials are provided, the
|
||
|
|
websocket connection requires encrypted client connections.
|
||
|
|
diff --git a/ui/vnc.c b/ui/vnc.c
|
||
|
|
index 71e3627be2..3cb24badf6 100644
|
||
|
|
--- a/ui/vnc.c
|
||
|
|
+++ b/ui/vnc.c
|
||
|
|
@@ -3725,11 +3725,6 @@ static int vnc_display_get_address(const char *addrstr,
|
||
|
|
addr->type = SOCKET_ADDRESS_TYPE_UNIX;
|
||
|
|
addr->u.q_unix.path = g_strdup(addrstr + 5);
|
||
|
|
|
||
|
|
- if (websocket) {
|
||
|
|
- error_setg(errp, "UNIX sockets not supported with websock");
|
||
|
|
- goto cleanup;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
if (to) {
|
||
|
|
error_setg(errp, "Port range not support with UNIX socket");
|
||
|
|
goto cleanup;
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|