From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 15/20] vnc: fix local state init
Date: Mon, 16 Nov 2015 18:25:30 +0100 [thread overview]
Message-ID: <1447694735-3420-16-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1447694735-3420-1-git-send-email-kraxel@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Peter Lieven <pl@kamp.de>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 1446203414-4013-16-git-send-email-kraxel@redhat.com
---
ui/vnc-jobs.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
index fd9ed39..12389cc 100644
--- a/ui/vnc-jobs.c
+++ b/ui/vnc-jobs.c
@@ -185,6 +185,9 @@ void vnc_jobs_consume_buffer(VncState *vs)
*/
static void vnc_async_encoding_start(VncState *orig, VncState *local)
{
+ buffer_init(&local->output, "vnc-worker-output");
+ local->csock = -1; /* Don't do any network work on this thread */
+
local->vnc_encoding = orig->vnc_encoding;
local->features = orig->features;
local->vd = orig->vd;
@@ -196,7 +199,6 @@ static void vnc_async_encoding_start(VncState *orig, VncState *local)
local->zlib = orig->zlib;
local->hextile = orig->hextile;
local->zrle = orig->zrle;
- local->csock = -1; /* Don't do any network work on this thread */
}
static void vnc_async_encoding_end(VncState *orig, VncState *local)
@@ -212,12 +214,10 @@ static int vnc_worker_thread_loop(VncJobQueue *queue)
{
VncJob *job;
VncRectEntry *entry, *tmp;
- VncState vs;
+ VncState vs = {};
int n_rectangles;
int saved_offset;
- buffer_init(&vs.output, "vnc-worker-output");
-
vnc_lock_queue(queue);
while (QTAILQ_EMPTY(&queue->jobs) && !queue->exit) {
qemu_cond_wait(&queue->cond, &queue->mutex);
--
1.8.3.1
next prev parent reply other threads:[~2015-11-16 17:25 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-16 17:25 [Qemu-devel] [PULL for-2.5 00/20] vnc: buffer code improvements, bugfixes Gerd Hoffmann
2015-11-16 17:25 ` [Qemu-devel] [PULL 01/20] buffer: make the Buffer capacity increase in powers of two Gerd Hoffmann
2015-11-16 17:25 ` [Qemu-devel] [PULL 02/20] buffer: add buffer_init Gerd Hoffmann
2015-11-16 17:25 ` [Qemu-devel] [PULL 03/20] buffer: add buffer_move_empty Gerd Hoffmann
2015-11-16 17:25 ` [Qemu-devel] [PULL 04/20] buffer: add buffer_move Gerd Hoffmann
2015-11-16 17:25 ` [Qemu-devel] [PULL 05/20] buffer: add buffer_shrink Gerd Hoffmann
2015-11-16 17:25 ` [Qemu-devel] [PULL 06/20] buffer: add tracing Gerd Hoffmann
2015-11-16 17:25 ` [Qemu-devel] [PULL 07/20] vnc: attach names to buffers Gerd Hoffmann
2015-11-16 17:25 ` [Qemu-devel] [PULL 08/20] vnc: kill jobs queue buffer Gerd Hoffmann
2015-11-16 17:25 ` [Qemu-devel] [PULL 09/20] vnc-jobs: move buffer reset, use new buffer move Gerd Hoffmann
2015-11-16 17:25 ` [Qemu-devel] [PULL 10/20] vnc: zap dead code Gerd Hoffmann
2015-11-16 17:25 ` [Qemu-devel] [PULL 11/20] vnc: add vnc_width+vnc_height helpers Gerd Hoffmann
2015-11-16 17:25 ` [Qemu-devel] [PULL 12/20] vnc: factor out vnc_update_server_surface Gerd Hoffmann
2015-11-16 17:25 ` [Qemu-devel] [PULL 13/20] vnc: use vnc_{width, height} in vnc_set_area_dirty Gerd Hoffmann
2015-11-16 17:25 ` [Qemu-devel] [PULL 14/20] vnc: only alloc server surface with clients connected Gerd Hoffmann
2015-11-16 17:25 ` Gerd Hoffmann [this message]
2015-11-16 17:25 ` [Qemu-devel] [PULL 16/20] vnc: recycle empty vs->output buffer Gerd Hoffmann
2015-11-16 17:25 ` [Qemu-devel] [PULL 17/20] buffer: factor out buffer_req_size Gerd Hoffmann
2015-11-16 17:25 ` [Qemu-devel] [PULL 18/20] buffer: factor out buffer_adj_size Gerd Hoffmann
2015-11-16 17:25 ` [Qemu-devel] [PULL 19/20] buffer: allow a buffer to shrink gracefully Gerd Hoffmann
2015-11-16 17:25 ` [Qemu-devel] [PULL 20/20] vnc: fix mismerge Gerd Hoffmann
2015-11-17 16:32 ` [Qemu-devel] [PULL for-2.5 00/20] vnc: buffer code improvements, bugfixes Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1447694735-3420-16-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).