From 6aa5ecba562710d7564d215db8bb4052de6ee923 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Sun, 24 Jul 2011 16:34:14 -0300 Subject: [RHEL6 qemu-kvm PATCH 33/65] spice: add qemu_spice_display_init_common RH-Author: Alon Levy Message-id: <1311525266-12705-5-git-send-email-alevy@redhat.com> Patchwork-id: 30246 O-Subject: [PATCH RHEL6.2 04/16] spice: add qemu_spice_display_init_common Bugzilla: 700134 RH-Acked-by: Gerd Hoffmann RH-Acked-by: Yonit Halperin RH-Acked-by: Arnon Gilboa From: Gerd Hoffmann 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 upstream: patchwork http://patchwork.ozlabs.org/patch/105613/ acked and slated for 0.16.0 --- hw/qxl.c | 7 +------ ui/spice-display.c | 17 +++++++++++------ ui/spice-display.h | 1 + 3 files changed, 13 insertions(+), 12 deletions(-) Signed-off-by: Eduardo Habkost --- 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 5aff64e..8286629 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -1317,12 +1317,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 77a966e..dca8ac6 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -282,6 +282,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, @@ -495,12 +505,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.3.2