diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2013-03-05 15:24:14 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2013-03-18 10:21:59 +0100 |
| commit | c78f71378a345ea240c288993ca1378ded5504b9 (patch) | |
| tree | 0d5dc0c86064556faed610883db4422ac13c6d66 /ui/spice-display.c | |
| parent | bc2ed9704fff2c721e4056ab5281f0291718bfa6 (diff) | |
| download | qemu-c78f71378a345ea240c288993ca1378ded5504b9.tar.gz | |
console: stop using DisplayState in gfx hardware emulation
Use QemuConsole instead. Updates interfaces in console.[ch] and adapts
gfx hardware emulation code.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui/spice-display.c')
| -rw-r--r-- | ui/spice-display.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ui/spice-display.c b/ui/spice-display.c index 2127b3f37e..eaab19d9bd 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -334,7 +334,7 @@ void qemu_spice_destroy_host_primary(SimpleSpiceDisplay *ssd) qemu_spice_destroy_primary_surface(ssd, 0, QXL_SYNC); } -void qemu_spice_display_init_common(SimpleSpiceDisplay *ssd, DisplayState *ds) +void qemu_spice_display_init_common(SimpleSpiceDisplay *ssd) { qemu_mutex_init(&ssd->lock); QTAILQ_INIT(&ssd->updates); @@ -398,12 +398,14 @@ void qemu_spice_display_switch(SimpleSpiceDisplay *ssd, void qemu_spice_cursor_refresh_unlocked(SimpleSpiceDisplay *ssd) { if (ssd->cursor) { - dpy_cursor_define(ssd->dcl.ds, ssd->cursor); + assert(ssd->con); + dpy_cursor_define(ssd->con, ssd->cursor); cursor_put(ssd->cursor); ssd->cursor = NULL; } if (ssd->mouse_x != -1 && ssd->mouse_y != -1) { - dpy_mouse_set(ssd->dcl.ds, ssd->mouse_x, ssd->mouse_y, 1); + assert(ssd->con); + dpy_mouse_set(ssd->con, ssd->mouse_x, ssd->mouse_y, 1); ssd->mouse_x = -1; ssd->mouse_y = -1; } @@ -613,7 +615,7 @@ void qemu_spice_display_init(DisplayState *ds) { SimpleSpiceDisplay *ssd = g_new0(SimpleSpiceDisplay, 1); - qemu_spice_display_init_common(ssd, ds); + qemu_spice_display_init_common(ssd); ssd->qxl.base.sif = &dpy_interface.base; qemu_spice_add_interface(&ssd->qxl.base); |