[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/10] ui: move some initialization out of vnc_init_s
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 08/10] ui: move some initialization out of vnc_init_state |
Date: |
Thu, 13 Oct 2016 11:32:56 +0200 |
From: "Daniel P. Berrange" <address@hidden>
Most of the fields in VncState are initialized in the
vnc_connect() method, but some are done in vnc_init_state()
instead.
The purpose of having vnc_init_state() is to delay starting
of the VNC wire protocol until after the websockets handshake
has completed. As such the vnc_init_state() method only needs
to be used for initialization that is dependant on the wire
protocol running.
This also lets us get rid of the initialized boolean flag
from the VncState struct.
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/vnc.c | 49 +++++++++++++++++++++++--------------------------
ui/vnc.h | 1 -
2 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index 7c8f07d..c10a003 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -1222,13 +1222,13 @@ void vnc_disconnect_finish(VncState *vs)
audio_del(vs);
vnc_release_modifiers(vs);
- if (vs->initialized) {
- QTAILQ_REMOVE(&vs->vd->clients, vs, next);
+ if (vs->mouse_mode_notifier.notify != NULL) {
qemu_remove_mouse_mode_change_notifier(&vs->mouse_mode_notifier);
- if (QTAILQ_EMPTY(&vs->vd->clients)) {
- /* last client gone */
- vnc_update_server_surface(vs->vd);
- }
+ }
+ QTAILQ_REMOVE(&vs->vd->clients, vs, next);
+ if (QTAILQ_EMPTY(&vs->vd->clients)) {
+ /* last client gone */
+ vnc_update_server_surface(vs->vd);
}
if (vs->vd->lock_key_sync)
@@ -2978,6 +2978,7 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSocket
*sioc,
bool skipauth, bool websocket)
{
VncState *vs = g_new0(VncState, 1);
+ bool first_client = QTAILQ_EMPTY(&vd->clients);
int i;
vs->sioc = sioc;
@@ -3045,26 +3046,6 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSocket
*sioc,
vnc_qmp_event(vs, QAPI_EVENT_VNC_CONNECTED);
vnc_set_share_mode(vs, VNC_SHARE_MODE_CONNECTING);
- if (!vs->websocket) {
- vnc_init_state(vs);
- }
-
- if (vd->num_connecting > vd->connections_limit) {
- QTAILQ_FOREACH(vs, &vd->clients, next) {
- if (vs->share_mode == VNC_SHARE_MODE_CONNECTING) {
- vnc_disconnect_start(vs);
- return;
- }
- }
- }
-}
-
-void vnc_init_state(VncState *vs)
-{
- vs->initialized = true;
- VncDisplay *vd = vs->vd;
- bool first_client = QTAILQ_EMPTY(&vd->clients);
-
vs->last_x = -1;
vs->last_y = -1;
@@ -3083,6 +3064,22 @@ void vnc_init_state(VncState *vs)
graphic_hw_update(vd->dcl.con);
+ if (!vs->websocket) {
+ vnc_init_state(vs);
+ }
+
+ if (vd->num_connecting > vd->connections_limit) {
+ QTAILQ_FOREACH(vs, &vd->clients, next) {
+ if (vs->share_mode == VNC_SHARE_MODE_CONNECTING) {
+ vnc_disconnect_start(vs);
+ return;
+ }
+ }
+ }
+}
+
+void vnc_init_state(VncState *vs)
+{
vnc_write(vs, "RFB 003.008\n", 12);
vnc_flush(vs);
vnc_read_when(vs, protocol_version, 12);
diff --git a/ui/vnc.h b/ui/vnc.h
index d191d88..e48e155 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -307,7 +307,6 @@ struct VncState
QEMUPutLEDEntry *led;
bool abort;
- bool initialized;
QemuMutex output_mutex;
QEMUBH *bh;
Buffer jobs_buffer;
--
1.8.3.1
- [Qemu-devel] [PULL 00/10] ui: vnc cleanups, input-linux kbd fix., Gerd Hoffmann, 2016/10/13
- [Qemu-devel] [PULL 01/10] ui: remove misleading comment from vnc_init_state, Gerd Hoffmann, 2016/10/13
- [Qemu-devel] [PULL 07/10] ui: remove bogus call to reset_keys() in vnc_init_state, Gerd Hoffmann, 2016/10/13
- [Qemu-devel] [PULL 10/10] input-linux: initialize key state, Gerd Hoffmann, 2016/10/13
- [Qemu-devel] [PULL 03/10] ui: remove 'ws_tls' field from VncState, Gerd Hoffmann, 2016/10/13
- [Qemu-devel] [PULL 04/10] ui: rename misleading 'VncDisplay' variables, Gerd Hoffmann, 2016/10/13
- [Qemu-devel] [PULL 06/10] ui: remove bogus call to graphic_hw_update() in vnc_listen_io, Gerd Hoffmann, 2016/10/13
- [Qemu-devel] [PULL 05/10] ui: refactor method for setting up VncDisplay auth types, Gerd Hoffmann, 2016/10/13
- [Qemu-devel] [PULL 08/10] ui: move some initialization out of vnc_init_state,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 02/10] ui: remove 'enabled' and 'ws_enabled' fields from VncState, Gerd Hoffmann, 2016/10/13
- [Qemu-devel] [PULL 09/10] ui: rename vnc_init_state to vnc_start_protocol, Gerd Hoffmann, 2016/10/13
- Re: [Qemu-devel] [PULL 00/10] ui: vnc cleanups, input-linux kbd fix., Peter Maydell, 2016/10/13