Commit d86fb034 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20141216-1' into staging 



misc spice updates.

# gpg: Signature made Tue 16 Dec 2014 14:03:07 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/spice/tags/pull-spice-20141216-1:
  spice: fix memory leak
  spice: remove spice-experimental.h include
  spice: do not require TCP ports
  spice: rework mirror allocation, add no-resize fast path
  spice: reduce refresh rate in native mode
  spice: use bottom half instead of refresh timer for cursor updates

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4db753b1 a4164270

hw/display/qxl-render.c

+2 −0
Original line number Diff line number Diff line
@@ -283,12 +283,14 @@ int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext) 
        qxl->ssd.mouse_x = cmd->u.set.position.x;

        qxl->ssd.mouse_y = cmd->u.set.position.y;

        qemu_mutex_unlock(&qxl->ssd.lock);

        qemu_bh_schedule(qxl->ssd.cursor_bh);

        break;

    case QXL_CURSOR_MOVE:

        qemu_mutex_lock(&qxl->ssd.lock);

        qxl->ssd.mouse_x = cmd->u.position.x;

        qxl->ssd.mouse_y = cmd->u.position.y;

        qemu_mutex_unlock(&qxl->ssd.lock);

        qemu_bh_schedule(qxl->ssd.cursor_bh);

        break;

    }

    return 0;

hw/display/qxl.c

+4 −4
Original line number Diff line number Diff line
@@ -1092,6 +1092,7 @@ static void qxl_enter_vga_mode(PCIQXLDevice *d) 
    spice_qxl_driver_unload(&d->ssd.qxl);

#endif

    graphic_console_set_hwops(d->ssd.dcl.con, d->vga.hw_ops, &d->vga);

    update_displaychangelistener(&d->ssd.dcl, GUI_REFRESH_INTERVAL_DEFAULT);

    qemu_spice_create_host_primary(&d->ssd);

    d->mode = QXL_MODE_VGA;

    vga_dirty_log_start(&d->vga);
@@ -1105,6 +1106,7 @@ static void qxl_exit_vga_mode(PCIQXLDevice *d) 
    }

    trace_qxl_exit_vga_mode(d->id);

    graphic_console_set_hwops(d->ssd.dcl.con, &qxl_ops, d);

    update_displaychangelistener(&d->ssd.dcl, GUI_REFRESH_INTERVAL_IDLE);

    vga_dirty_log_stop(&d->vga);

    qxl_destroy_primary(d, QXL_SYNC);

}
@@ -1153,6 +1155,7 @@ static void qxl_soft_reset(PCIQXLDevice *d) 
        qxl_enter_vga_mode(d);

    } else {

        d->mode = QXL_MODE_UNDEFINED;

        update_displaychangelistener(&d->ssd.dcl, GUI_REFRESH_INTERVAL_IDLE);

    }

}
@@ -1861,10 +1864,6 @@ static void display_refresh(DisplayChangeListener *dcl) 


    if (qxl->mode == QXL_MODE_VGA) {

        qemu_spice_display_refresh(&qxl->ssd);

    } else {

        qemu_mutex_lock(&qxl->ssd.lock);

        qemu_spice_cursor_refresh_unlocked(&qxl->ssd);

        qemu_mutex_unlock(&qxl->ssd.lock);

    }

}
@@ -2025,6 +2024,7 @@ static int qxl_init_common(PCIQXLDevice *qxl) 
    qxl_reset_state(qxl);



    qxl->update_area_bh = qemu_bh_new(qxl_render_update_area_bh, qxl);

    qxl->ssd.cursor_bh = qemu_bh_new(qemu_spice_cursor_refresh_bh, &qxl->ssd);



    return 0;

}

include/ui/spice-display.h

+2 −1
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ struct SimpleSpiceDisplay { 
    /* cursor (with qxl): qxl local renderer -> displaychangelistener */

    QEMUCursor *cursor;

    int mouse_x, mouse_y;

    QEMUBH *cursor_bh;

};



struct SimpleSpiceUpdate {
@@ -134,7 +135,7 @@ void qemu_spice_display_update(SimpleSpiceDisplay *ssd, 
void qemu_spice_display_switch(SimpleSpiceDisplay *ssd,

                               DisplaySurface *surface);

void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd);

void qemu_spice_cursor_refresh_unlocked(SimpleSpiceDisplay *ssd);

void qemu_spice_cursor_refresh_bh(void *opaque);



void qemu_spice_add_memslot(SimpleSpiceDisplay *ssd, QXLDevMemSlot *memslot,

                            qxl_async_io async);

spice-qemu-char.c

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
#include "ui/qemu-spice.h"

#include "sysemu/char.h"

#include <spice.h>

#include <spice-experimental.h>

#include <spice/protocol.h>



#include "qemu/osdep.h"

ui/spice-core.c

+1 −9
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
 */



#include <spice.h>

#include <spice-experimental.h>



#include <netdb.h>

#include "sysemu/sysemu.h"
@@ -386,10 +385,7 @@ static SpiceChannelList *qmp_query_spice_channels(void) 
        struct sockaddr *paddr;

        socklen_t plen;



        if (!(item->info->flags & SPICE_CHANNEL_EVENT_FLAG_ADDR_EXT)) {

            error_report("invalid channel event");

            return NULL;

        }

        assert(item->info->flags & SPICE_CHANNEL_EVENT_FLAG_ADDR_EXT);



        chan = g_malloc0(sizeof(*chan));

        chan->value = g_malloc0(sizeof(*chan->value));
@@ -661,10 +657,6 @@ void qemu_spice_init(void) 
    }

    port = qemu_opt_get_number(opts, "port", 0);

    tls_port = qemu_opt_get_number(opts, "tls-port", 0);

    if (!port && !tls_port) {

        error_report("neither port nor tls-port specified for spice");

        exit(1);

    }

    if (port < 0 || port > 65535) {

        error_report("spice port is out of range");

        exit(1);