Re: [Qemu-devel] [RfC PATCH 08/10] name vnc buffers

[Peter Lieven <pl@kamp.de>]

Am 24.09.2015 um 10:42 schrieb Gerd Hoffmann:
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  ui/vnc-jobs.c |  1 +
>  ui/vnc.c      | 16 ++++++++++++++++
>  2 files changed, 17 insertions(+)
>
> diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
> index 9824c34..7a234da 100644
> --- a/ui/vnc-jobs.c
> +++ b/ui/vnc-jobs.c
> @@ -303,6 +303,7 @@ static VncJobQueue *vnc_queue_init(void)
>  
>      qemu_cond_init(&queue->cond);
>      qemu_mutex_init(&queue->mutex);
> +    qio_buffer_init(&queue->buffer, "vnc-job-queue");
>      QTAILQ_INIT(&queue->jobs);
>      return queue;
>  }
> diff --git a/ui/vnc.c b/ui/vnc.c
> index e4b0e3a..fc0311f 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -2978,6 +2978,22 @@ static void vnc_connect(VncDisplay *vd, int csock,
>      vs->csock = csock;
>      vs->vd = vd;
>  
> +    qio_buffer_init(&vs->input,          "vnc-input/%d", csock);
> +    qio_buffer_init(&vs->output,         "vnc-output/%d", csock);
> +    qio_buffer_init(&vs->ws_input,       "vnc-ws_input/%d", csock);
> +    qio_buffer_init(&vs->ws_output,      "vnc-ws_output/%d", csock);
> +    qio_buffer_init(&vs->jobs_buffer,    "vnc-jobs_buffer/%d", csock);
> +
> +    qio_buffer_init(&vs->tight.tight,    "vnc-tight/%d", csock);
> +    qio_buffer_init(&vs->tight.zlib,     "vnc-tight-zlib/%d", csock);
> +    qio_buffer_init(&vs->tight.gradient, "vnc-tight-gradient/%d", csock);
> +    qio_buffer_init(&vs->tight.jpeg,     "vnc-tight-jpeg/%d", csock);
> +    qio_buffer_init(&vs->tight.png,      "vnc-tight-png/%d", csock);

png and jpeg support is not generally available:

diff --git a/ui/vnc.c b/ui/vnc.c
index fc0311f..454087f 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2987,8 +2987,12 @@ static void vnc_connect(VncDisplay *vd, int csock,
     qio_buffer_init(&vs->tight.tight,    "vnc-tight/%d", csock);
     qio_buffer_init(&vs->tight.zlib,     "vnc-tight-zlib/%d", csock);
     qio_buffer_init(&vs->tight.gradient, "vnc-tight-gradient/%d", csock);
+#ifdef CONFIG_VNC_JPEG
     qio_buffer_init(&vs->tight.jpeg,     "vnc-tight-jpeg/%d", csock);
+#endif
+#ifdef CONFIG_VNC_PNG
     qio_buffer_init(&vs->tight.png,      "vnc-tight-png/%d", csock);
+#endif
     qio_buffer_init(&vs->zlib.zlib,      "vnc-zlib/%d", csock);
     qio_buffer_init(&vs->zrle.zrle,      "vnc-zrle/%d", csock);
     qio_buffer_init(&vs->zrle.fb,        "vnc-zrle-fb/%d", csock);

Peter