Revision c78f7137 ui/spice-display.c

b/ui/spice-display.c
334 334
    qemu_spice_destroy_primary_surface(ssd, 0, QXL_SYNC);
335 335
}
336 336

  
337
void qemu_spice_display_init_common(SimpleSpiceDisplay *ssd, DisplayState *ds)
337
void qemu_spice_display_init_common(SimpleSpiceDisplay *ssd)
338 338
{
339 339
    qemu_mutex_init(&ssd->lock);
340 340
    QTAILQ_INIT(&ssd->updates);
......
398 398
void qemu_spice_cursor_refresh_unlocked(SimpleSpiceDisplay *ssd)
399 399
{
400 400
    if (ssd->cursor) {
401
        dpy_cursor_define(ssd->dcl.ds, ssd->cursor);
401
        assert(ssd->con);
402
        dpy_cursor_define(ssd->con, ssd->cursor);
402 403
        cursor_put(ssd->cursor);
403 404
        ssd->cursor = NULL;
404 405
    }
405 406
    if (ssd->mouse_x != -1 && ssd->mouse_y != -1) {
406
        dpy_mouse_set(ssd->dcl.ds, ssd->mouse_x, ssd->mouse_y, 1);
407
        assert(ssd->con);
408
        dpy_mouse_set(ssd->con, ssd->mouse_x, ssd->mouse_y, 1);
407 409
        ssd->mouse_x = -1;
408 410
        ssd->mouse_y = -1;
409 411
    }
......
613 615
{
614 616
    SimpleSpiceDisplay *ssd = g_new0(SimpleSpiceDisplay, 1);
615 617

  
616
    qemu_spice_display_init_common(ssd, ds);
618
    qemu_spice_display_init_common(ssd);
617 619

  
618 620
    ssd->qxl.base.sif = &dpy_interface.base;
619 621
    qemu_spice_add_interface(&ssd->qxl.base);

Also available in: Unified diff