85 lines
2.9 KiB
Diff
85 lines
2.9 KiB
Diff
>From c28ee0e7c851fc58ac6ef8f5137fc35cc55b607c Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Fri, 17 Jun 2011 10:42:25 +0200
|
|
Subject: [PATCH 13/28] spice: add qemu_spice_display_init_common
|
|
|
|
Factor out SimpleSpiceDisplay initialization into
|
|
qemu_spice_display_init_common() and call it from
|
|
both qxl.c (for vga mode) and spice-display.c
|
|
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
---
|
|
hw/qxl.c | 7 +------
|
|
ui/spice-display.c | 17 +++++++++++------
|
|
ui/spice-display.h | 1 +
|
|
3 files changed, 13 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/hw/qxl.c b/hw/qxl.c
|
|
index 5deb776..2127fa3 100644
|
|
--- a/hw/qxl.c
|
|
+++ b/hw/qxl.c
|
|
@@ -1315,12 +1315,7 @@ static int qxl_init_primary(PCIDevice *dev)
|
|
|
|
vga->ds = graphic_console_init(qxl_hw_update, qxl_hw_invalidate,
|
|
qxl_hw_screen_dump, qxl_hw_text_update, qxl);
|
|
- qxl->ssd.ds = vga->ds;
|
|
- qemu_mutex_init(&qxl->ssd.lock);
|
|
- qxl->ssd.mouse_x = -1;
|
|
- qxl->ssd.mouse_y = -1;
|
|
- qxl->ssd.bufsize = (16 * 1024 * 1024);
|
|
- qxl->ssd.buf = qemu_malloc(qxl->ssd.bufsize);
|
|
+ qemu_spice_display_init_common(&qxl->ssd, vga->ds);
|
|
|
|
qxl0 = qxl;
|
|
register_displaychangelistener(vga->ds, &display_listener);
|
|
diff --git a/ui/spice-display.c b/ui/spice-display.c
|
|
index 1e6a38f..93e25bf 100644
|
|
--- a/ui/spice-display.c
|
|
+++ b/ui/spice-display.c
|
|
@@ -286,6 +286,16 @@ void qemu_spice_vm_change_state_handler(void *opaque, int running, int reason)
|
|
ssd->running = running;
|
|
}
|
|
|
|
+void qemu_spice_display_init_common(SimpleSpiceDisplay *ssd, DisplayState *ds)
|
|
+{
|
|
+ ssd->ds = ds;
|
|
+ qemu_mutex_init(&ssd->lock);
|
|
+ ssd->mouse_x = -1;
|
|
+ ssd->mouse_y = -1;
|
|
+ ssd->bufsize = (16 * 1024 * 1024);
|
|
+ ssd->buf = qemu_malloc(ssd->bufsize);
|
|
+}
|
|
+
|
|
/* display listener callbacks */
|
|
|
|
void qemu_spice_display_update(SimpleSpiceDisplay *ssd,
|
|
@@ -499,12 +509,7 @@ static DisplayChangeListener display_listener = {
|
|
void qemu_spice_display_init(DisplayState *ds)
|
|
{
|
|
assert(sdpy.ds == NULL);
|
|
- sdpy.ds = ds;
|
|
- qemu_mutex_init(&sdpy.lock);
|
|
- sdpy.mouse_x = -1;
|
|
- sdpy.mouse_y = -1;
|
|
- sdpy.bufsize = (16 * 1024 * 1024);
|
|
- sdpy.buf = qemu_malloc(sdpy.bufsize);
|
|
+ qemu_spice_display_init_common(&sdpy, ds);
|
|
register_displaychangelistener(ds, &display_listener);
|
|
|
|
sdpy.qxl.base.sif = &dpy_interface.base;
|
|
diff --git a/ui/spice-display.h b/ui/spice-display.h
|
|
index 5b06b11..eb7a573 100644
|
|
--- a/ui/spice-display.h
|
|
+++ b/ui/spice-display.h
|
|
@@ -75,6 +75,7 @@ void qemu_spice_create_host_memslot(SimpleSpiceDisplay *ssd);
|
|
void qemu_spice_create_host_primary(SimpleSpiceDisplay *ssd);
|
|
void qemu_spice_destroy_host_primary(SimpleSpiceDisplay *ssd);
|
|
void qemu_spice_vm_change_state_handler(void *opaque, int running, int reason);
|
|
+void qemu_spice_display_init_common(SimpleSpiceDisplay *ssd, DisplayState *ds);
|
|
|
|
void qemu_spice_display_update(SimpleSpiceDisplay *ssd,
|
|
int x, int y, int w, int h);
|
|
--
|
|
1.7.5.1
|
|
|