|
 |
56753ff |
From 1cae61c4d4fe994e5158d63d5f4fe9b52a7b8211 Mon Sep 17 00:00:00 2001
|
|
|
56753ff |
From: Alon Levy <alevy@redhat.com>
|
|
|
56753ff |
Date: Fri, 24 Feb 2012 23:19:25 +0200
|
|
|
56753ff |
Subject: [PATCH 412/434] qxl: fix spice+sdl no cursor regression
|
|
|
56753ff |
MIME-Version: 1.0
|
|
|
56753ff |
Content-Type: text/plain; charset=UTF-8
|
|
|
56753ff |
Content-Transfer-Encoding: 8bit
|
|
|
56753ff |
|
|
|
56753ff |
regression introduced by 075360945860ad9bdd491921954b383bf762b0e5,
|
|
|
56753ff |
|
|
|
56753ff |
v2: lock around qemu_spice_cursor_refresh_unlocked
|
|
|
56753ff |
|
|
|
56753ff |
Reported-by: Fabiano FidĂȘncio <fabiano@fidencio.org>
|
|
|
56753ff |
Signed-off-by: Alon Levy <alevy@redhat.com>
|
|
|
56753ff |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
56753ff |
---
|
|
|
56753ff |
hw/qxl.c | 4 ++++
|
|
|
56753ff |
ui/spice-display.c | 23 ++++++++++++++---------
|
|
|
56753ff |
ui/spice-display.h | 1 +
|
|
|
56753ff |
3 files changed, 19 insertions(+), 9 deletions(-)
|
|
|
56753ff |
|
|
|
56753ff |
diff --git a/hw/qxl.c b/hw/qxl.c
|
|
|
56753ff |
index c8839c3..17f2576 100644
|
|
|
56753ff |
--- a/hw/qxl.c
|
|
|
56753ff |
+++ b/hw/qxl.c
|
|
|
56753ff |
@@ -1548,6 +1548,10 @@ static void display_refresh(struct DisplayState *ds)
|
|
|
56753ff |
{
|
|
|
56753ff |
if (qxl0->mode == QXL_MODE_VGA) {
|
|
|
56753ff |
qemu_spice_display_refresh(&qxl0->ssd);
|
|
|
56753ff |
+ } else {
|
|
|
56753ff |
+ qemu_mutex_lock(&qxl0->ssd.lock);
|
|
|
56753ff |
+ qemu_spice_cursor_refresh_unlocked(&qxl0->ssd);
|
|
|
56753ff |
+ qemu_mutex_unlock(&qxl0->ssd.lock);
|
|
|
56753ff |
}
|
|
|
56753ff |
}
|
|
|
56753ff |
|
|
|
56753ff |
diff --git a/ui/spice-display.c b/ui/spice-display.c
|
|
|
56753ff |
index 6c302a3..c6e61d8 100644
|
|
|
56753ff |
--- a/ui/spice-display.c
|
|
|
56753ff |
+++ b/ui/spice-display.c
|
|
|
56753ff |
@@ -317,16 +317,8 @@ void qemu_spice_display_resize(SimpleSpiceDisplay *ssd)
|
|
|
56753ff |
ssd->notify++;
|
|
|
56753ff |
}
|
|
|
56753ff |
|
|
|
56753ff |
-void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd)
|
|
|
56753ff |
+void qemu_spice_cursor_refresh_unlocked(SimpleSpiceDisplay *ssd)
|
|
|
56753ff |
{
|
|
|
56753ff |
- dprint(3, "%s:\n", __FUNCTION__);
|
|
|
56753ff |
- vga_hw_update();
|
|
|
56753ff |
-
|
|
|
56753ff |
- qemu_mutex_lock(&ssd->lock);
|
|
|
56753ff |
- if (ssd->update == NULL) {
|
|
|
56753ff |
- ssd->update = qemu_spice_create_update(ssd);
|
|
|
56753ff |
- ssd->notify++;
|
|
|
56753ff |
- }
|
|
|
56753ff |
if (ssd->cursor) {
|
|
|
56753ff |
ssd->ds->cursor_define(ssd->cursor);
|
|
|
56753ff |
cursor_put(ssd->cursor);
|
|
|
56753ff |
@@ -337,6 +329,19 @@ void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd)
|
|
|
56753ff |
ssd->mouse_x = -1;
|
|
|
56753ff |
ssd->mouse_y = -1;
|
|
|
56753ff |
}
|
|
|
56753ff |
+}
|
|
|
56753ff |
+
|
|
|
56753ff |
+void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd)
|
|
|
56753ff |
+{
|
|
|
56753ff |
+ dprint(3, "%s:\n", __func__);
|
|
|
56753ff |
+ vga_hw_update();
|
|
|
56753ff |
+
|
|
|
56753ff |
+ qemu_mutex_lock(&ssd->lock);
|
|
|
56753ff |
+ if (ssd->update == NULL) {
|
|
|
56753ff |
+ ssd->update = qemu_spice_create_update(ssd);
|
|
|
56753ff |
+ ssd->notify++;
|
|
|
56753ff |
+ }
|
|
|
56753ff |
+ qemu_spice_cursor_refresh_unlocked(ssd);
|
|
|
56753ff |
qemu_mutex_unlock(&ssd->lock);
|
|
|
56753ff |
|
|
|
56753ff |
if (ssd->notify) {
|
|
|
56753ff |
diff --git a/ui/spice-display.h b/ui/spice-display.h
|
|
|
56753ff |
index 5e52df9..a23bfc8 100644
|
|
|
56753ff |
--- a/ui/spice-display.h
|
|
|
56753ff |
+++ b/ui/spice-display.h
|
|
|
56753ff |
@@ -97,6 +97,7 @@ void qemu_spice_display_update(SimpleSpiceDisplay *ssd,
|
|
|
56753ff |
int x, int y, int w, int h);
|
|
|
56753ff |
void qemu_spice_display_resize(SimpleSpiceDisplay *ssd);
|
|
|
56753ff |
void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd);
|
|
|
56753ff |
+void qemu_spice_cursor_refresh_unlocked(SimpleSpiceDisplay *ssd);
|
|
|
56753ff |
|
|
|
56753ff |
void qemu_spice_add_memslot(SimpleSpiceDisplay *ssd, QXLDevMemSlot *memslot,
|
|
|
56753ff |
qxl_async_io async);
|
|
|
56753ff |
--
|
|
|
56753ff |
1.7.10
|
|
|
56753ff |
|