[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RfC PATCH 03/12] spice: zap sdpy global
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [RfC PATCH 03/12] spice: zap sdpy global |
Date: |
Fri, 1 Mar 2013 10:00:34 +0100 |
DisplayChangeListener is passed now to all DisplayChangeListenerOps
callbacks, so we can use that to access the spice display state and
kill the sdpy global variable.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/spice-display.c | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/ui/spice-display.c b/ui/spice-display.c
index b6528fa..b2bda23 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -581,25 +581,26 @@ static const QXLInterface dpy_interface = {
.client_monitors_config = interface_client_monitors_config,
};
-static SimpleSpiceDisplay sdpy;
-
static void display_update(DisplayChangeListener *dcl,
struct DisplayState *ds,
int x, int y, int w, int h)
{
- qemu_spice_display_update(&sdpy, x, y, w, h);
+ SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
+ qemu_spice_display_update(ssd, x, y, w, h);
}
static void display_resize(DisplayChangeListener *dcl,
struct DisplayState *ds)
{
- qemu_spice_display_resize(&sdpy);
+ SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
+ qemu_spice_display_resize(ssd);
}
static void display_refresh(DisplayChangeListener *dcl,
struct DisplayState *ds)
{
- qemu_spice_display_refresh(&sdpy);
+ SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
+ qemu_spice_display_refresh(ssd);
}
static const DisplayChangeListenerOps display_listener_ops = {
@@ -611,16 +612,17 @@ static const DisplayChangeListenerOps
display_listener_ops = {
void qemu_spice_display_init(DisplayState *ds)
{
- assert(sdpy.ds == NULL);
- qemu_spice_display_init_common(&sdpy, ds);
+ SimpleSpiceDisplay *ssd = g_new0(SimpleSpiceDisplay, 1);
+
+ qemu_spice_display_init_common(ssd, ds);
- sdpy.qxl.base.sif = &dpy_interface.base;
- qemu_spice_add_interface(&sdpy.qxl.base);
- assert(sdpy.worker);
+ ssd->qxl.base.sif = &dpy_interface.base;
+ qemu_spice_add_interface(&ssd->qxl.base);
+ assert(ssd->worker);
- qemu_spice_create_host_memslot(&sdpy);
- qemu_spice_create_host_primary(&sdpy);
+ qemu_spice_create_host_memslot(ssd);
+ qemu_spice_create_host_primary(ssd);
- sdpy.dcl.ops = &display_listener_ops;
- register_displaychangelistener(ds, &sdpy.dcl);
+ ssd->dcl.ops = &display_listener_ops;
+ register_displaychangelistener(ds, &ssd->dcl);
}
--
1.7.9.7
- [Qemu-devel] [RfC PATCH 00/12] console/display: cleanup & untangle data structures., Gerd Hoffmann, 2013/03/01
- [Qemu-devel] [RfC PATCH 04/12] qxl: zap qxl0 global, Gerd Hoffmann, 2013/03/01
- [Qemu-devel] [RfC PATCH 09/12] console: add surface_*() getters, Gerd Hoffmann, 2013/03/01
- [Qemu-devel] [RfC PATCH 10/12] gtk: stop using DisplayState, Gerd Hoffmann, 2013/03/01
- [Qemu-devel] [RfC PATCH 03/12] spice: zap sdpy global,
Gerd Hoffmann <=
- [Qemu-devel] [RfC PATCH 06/12] sdl: drop dead code, Gerd Hoffmann, 2013/03/01
- [Qemu-devel] [RfC PATCH 11/12] vnc: stop using DisplayState, Gerd Hoffmann, 2013/03/01
- [Qemu-devel] [RfC PATCH 05/12] qxl: better vga init in enter_vga_mode, Gerd Hoffmann, 2013/03/01
- [Qemu-devel] [RfC PATCH 01/12] console: fix displaychangelisteners interface, Gerd Hoffmann, 2013/03/01
- [Qemu-devel] [RfC PATCH 02/12] console: kill DisplayState->opaque, Gerd Hoffmann, 2013/03/01
- [Qemu-devel] [RfC PATCH 12/12] sdl: stop using DisplayState, Gerd Hoffmann, 2013/03/01
- [Qemu-devel] [RfC PATCH 08/12] console: rework DisplaySurface handling [dcl/ui side], Gerd Hoffmann, 2013/03/01
- [Qemu-devel] [RfC PATCH 07/12] console: rework DisplaySurface handling [vga emu side], Gerd Hoffmann, 2013/03/01