summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2016-09-29 16:45:40 +0100
committerGerd Hoffmann <kraxel@redhat.com>2016-10-13 09:22:31 +0200
commitdbee9897d5c35643ab2932a86bdf27bee673a7b8 (patch)
tree10e27607937cff7fb1acd2448221021935fbdef9
parent90cd03a30ee96779ee9ae36a84b387452e256358 (diff)
downloadqemu-dbee9897d5c35643ab2932a86bdf27bee673a7b8.tar.gz
ui: rename vnc_init_state to vnc_start_protocol
Rename the vnc_init_state method to reflect what its actual purpose is, to discourage future devs from using it for more general state initialization. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Message-id: 1475163940-26094-10-git-send-email-berrange@redhat.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--ui/vnc-ws.c2
-rw-r--r--ui/vnc.c4
-rw-r--r--ui/vnc.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c
index 3bac46e774..42a8e7be5c 100644
--- a/ui/vnc-ws.c
+++ b/ui/vnc-ws.c
@@ -92,7 +92,7 @@ static void vncws_handshake_done(Object *source,
vnc_client_error(vs);
} else {
VNC_DEBUG("Websock handshake complete, starting VNC protocol\n");
- vnc_init_state(vs);
+ vnc_start_protocol(vs);
vs->ioc_tag = qio_channel_add_watch(
vs->ioc, G_IO_IN, vnc_client_io, vs, NULL);
}
diff --git a/ui/vnc.c b/ui/vnc.c
index c10a003b88..c1e98fb6bf 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3065,7 +3065,7 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSocket *sioc,
graphic_hw_update(vd->dcl.con);
if (!vs->websocket) {
- vnc_init_state(vs);
+ vnc_start_protocol(vs);
}
if (vd->num_connecting > vd->connections_limit) {
@@ -3078,7 +3078,7 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSocket *sioc,
}
}
-void vnc_init_state(VncState *vs)
+void vnc_start_protocol(VncState *vs)
{
vnc_write(vs, "RFB 003.008\n", 12);
vnc_flush(vs);
diff --git a/ui/vnc.h b/ui/vnc.h
index e48e155ce4..d20b154a77 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -515,7 +515,7 @@ void vnc_write_u8(VncState *vs, uint8_t value);
void vnc_flush(VncState *vs);
void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting);
void vnc_disconnect_finish(VncState *vs);
-void vnc_init_state(VncState *vs);
+void vnc_start_protocol(VncState *vs);
/* Buffer I/O functions */