Commit 6c098407 authored by Stefan Weil's avatar Stefan Weil Committed by Anthony Liguori
Browse files

Win32: Fix vnc support. 



Without this patch, qemu on windows crashes as soon
as a vnc client connects.

Signed-off-by: default avatarStefan Weil <weil@mail.berlios.de>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 1e7fbc6d

vnc.c

+21 −2
Original line number Diff line number Diff line
@@ -538,6 +538,25 @@ static void send_framebuffer_update_hextile(VncState *vs, int x, int y, int w, i 


}



#define ZALLOC_ALIGNMENT 16



static void *zalloc(void *x, unsigned items, unsigned size)

{

    void *p;



    size *= items;

    size = (size + ZALLOC_ALIGNMENT - 1) & ~(ZALLOC_ALIGNMENT - 1);



    p = qemu_mallocz(size);



    return (p);

}



static void zfree(void *x, void *addr)

{

    qemu_free(addr);

}



static void vnc_zlib_init(VncState *vs)

{

    int i;
@@ -572,8 +591,8 @@ static int vnc_zlib_stop(VncState *vs, int stream_id) 


        VNC_DEBUG("VNC: initializing zlib stream %d\n", stream_id);

        VNC_DEBUG("VNC: opaque = %p | vs = %p\n", zstream->opaque, vs);

        zstream->zalloc = Z_NULL;

        zstream->zfree = Z_NULL;

        zstream->zalloc = zalloc;

        zstream->zfree = zfree;



        err = deflateInit2(zstream, vs->tight_compression, Z_DEFLATED, MAX_WBITS,

                           MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY);