From 8366ff5a206b0f75edd17a4a78f7c389ebb81d49 Mon Sep 17 00:00:00 2001 Message-Id: <8366ff5a206b0f75edd17a4a78f7c389ebb81d49.1349887753.git.minovotn@redhat.com> From: Gerd Hoffmann Date: Fri, 21 Sep 2012 08:26:31 +0200 Subject: [PATCH 01/11] spice: switch to queue for vga mode updates RH-Author: Gerd Hoffmann Message-id: <1348215994-27217-2-git-send-email-kraxel@redhat.com> Patchwork-id: 42155 O-Subject: [RHEL-6.4 qemu-kvm PATCH 1/4] spice: switch to queue for vga mode updates Bugzilla: 854528 RH-Acked-by: Hans de Goede RH-Acked-by: Paolo Bonzini RH-Acked-by: Alon Levy Signed-off-by: Gerd Hoffmann Conflicts: ui/spice-display.c upstream: b1af98ba3e4c4fd44f233fc7240df2612baeb1c2 --- hw/qxl.c | 6 +++--- ui/spice-display.c | 25 ++++++++++++++----------- ui/spice-display.h | 3 ++- 3 files changed, 19 insertions(+), 15 deletions(-) Signed-off-by: Michal Novotny --- hw/qxl.c | 6 +++--- ui/spice-display.c | 25 ++++++++++++++----------- ui/spice-display.h | 3 ++- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 0647bf2..07231e2 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -518,9 +518,9 @@ static int interface_get_command(QXLInstance *sin, struct QXLCommandExt *ext) dprint(qxl, 2, "%s: vga\n", __FUNCTION__); ret = false; qemu_mutex_lock(&qxl->ssd.lock); - if (qxl->ssd.update != NULL) { - update = qxl->ssd.update; - qxl->ssd.update = NULL; + update = QTAILQ_FIRST(&qxl->ssd.updates); + if (update != NULL) { + QTAILQ_REMOVE(&qxl->ssd.updates, update, next); *ext = update->ext; ret = true; } diff --git a/ui/spice-display.c b/ui/spice-display.c index 7028f17..d227bc7 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -157,7 +157,7 @@ int qemu_spice_display_is_running(SimpleSpiceDisplay *ssd) #endif } -static SimpleSpiceUpdate *qemu_spice_create_update(SimpleSpiceDisplay *ssd) +static void qemu_spice_create_update(SimpleSpiceDisplay *ssd) { SimpleSpiceUpdate *update; QXLDrawable *drawable; @@ -167,7 +167,7 @@ static SimpleSpiceUpdate *qemu_spice_create_update(SimpleSpiceDisplay *ssd) int by, bw, bh; if (qemu_spice_rect_is_empty(&ssd->dirty)) { - return NULL; + return; }; dprint(2, "%s: lr %d -> %d, tb -> %d -> %d\n", __FUNCTION__, @@ -227,7 +227,7 @@ static SimpleSpiceUpdate *qemu_spice_create_update(SimpleSpiceDisplay *ssd) cmd->data = (intptr_t)drawable; memset(&ssd->dirty, 0, sizeof(ssd->dirty)); - return update; + QTAILQ_INSERT_TAIL(&ssd->updates, update, next); } /* @@ -301,6 +301,7 @@ void qemu_spice_display_init_common(SimpleSpiceDisplay *ssd, DisplayState *ds) { ssd->ds = ds; qemu_mutex_init(&ssd->lock); + QTAILQ_INIT(&ssd->updates); ssd->mouse_x = -1; ssd->mouse_y = -1; ssd->bufsize = (16 * 1024 * 1024); @@ -328,6 +329,8 @@ void qemu_spice_display_update(SimpleSpiceDisplay *ssd, void qemu_spice_display_resize(SimpleSpiceDisplay *ssd) { + SimpleSpiceUpdate *update; + dprint(1, "%s:\n", __FUNCTION__); memset(&ssd->dirty, 0, sizeof(ssd->dirty)); @@ -335,9 +338,9 @@ void qemu_spice_display_resize(SimpleSpiceDisplay *ssd) ssd->conv = NULL; qemu_mutex_lock(&ssd->lock); - if (ssd->update != NULL) { - qemu_spice_destroy_update(ssd, ssd->update); - ssd->update = NULL; + while ((update = QTAILQ_FIRST(&ssd->updates)) != NULL) { + QTAILQ_REMOVE(&ssd->updates, update, next); + qemu_spice_destroy_update(ssd, update); } qemu_mutex_unlock(&ssd->lock); qemu_spice_destroy_host_primary(ssd); @@ -367,8 +370,8 @@ void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd) vga_hw_update(); qemu_mutex_lock(&ssd->lock); - if (ssd->update == NULL) { - ssd->update = qemu_spice_create_update(ssd); + if (QTAILQ_EMPTY(&ssd->updates)) { + qemu_spice_create_update(ssd); ssd->notify++; } qemu_spice_cursor_refresh_unlocked(ssd); @@ -425,9 +428,9 @@ static int interface_get_command(QXLInstance *sin, struct QXLCommandExt *ext) dprint(3, "%s:\n", __FUNCTION__); qemu_mutex_lock(&ssd->lock); - if (ssd->update != NULL) { - update = ssd->update; - ssd->update = NULL; + update = QTAILQ_FIRST(&ssd->updates); + if (update != NULL) { + QTAILQ_REMOVE(&ssd->updates, update, next); *ext = update->ext; ret = true; } diff --git a/ui/spice-display.h b/ui/spice-display.h index 02e742f..03b0a3b 100644 --- a/ui/spice-display.h +++ b/ui/spice-display.h @@ -92,7 +92,7 @@ struct SimpleSpiceDisplay { * to them must be protected by the lock. */ QemuMutex lock; - SimpleSpiceUpdate *update; + QTAILQ_HEAD(, SimpleSpiceUpdate) updates; QEMUCursor *cursor; int mouse_x, mouse_y; }; @@ -102,6 +102,7 @@ struct SimpleSpiceUpdate { QXLImage image; QXLCommandExt ext; uint8_t *bitmap; + QTAILQ_ENTRY(SimpleSpiceUpdate) next; }; int qemu_spice_rect_is_empty(const QXLRect* r); -- 1.7.11.4