From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56163) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2PwP-0004J0-JC for qemu-devel@nongnu.org; Tue, 28 Feb 2012 11:30:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S2PwF-0003f5-A8 for qemu-devel@nongnu.org; Tue, 28 Feb 2012 11:30:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:6204) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2PwF-0003da-24 for qemu-devel@nongnu.org; Tue, 28 Feb 2012 11:30:07 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1SGU5vE008787 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 28 Feb 2012 11:30:05 -0500 From: Gerd Hoffmann Date: Tue, 28 Feb 2012 17:29:52 +0100 Message-Id: <1330446602-10743-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1330446602-10743-1-git-send-email-kraxel@redhat.com> References: <1330446602-10743-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 01/11] qxl: fix spice+sdl no cursor regression List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alon Levy , Gerd Hoffmann From: Alon Levy regression introduced by 075360945860ad9bdd491921954b383bf762b0e5, v2: lock around qemu_spice_cursor_refresh_unlocked Reported-by: Fabiano Fid=C3=AAncio Signed-off-by: Alon Levy Signed-off-by: Gerd Hoffmann --- hw/qxl.c | 4 ++++ ui/spice-display.c | 23 ++++++++++++++--------- ui/spice-display.h | 1 + 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index f643667..0bbf0e8 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -1545,6 +1545,10 @@ static void display_refresh(struct DisplayState *d= s) { if (qxl0->mode =3D=3D QXL_MODE_VGA) { qemu_spice_display_refresh(&qxl0->ssd); + } else { + qemu_mutex_lock(&qxl0->ssd.lock); + qemu_spice_cursor_refresh_unlocked(&qxl0->ssd); + qemu_mutex_unlock(&qxl0->ssd.lock); } } =20 diff --git a/ui/spice-display.c b/ui/spice-display.c index 6c302a3..c6e61d8 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -317,16 +317,8 @@ void qemu_spice_display_resize(SimpleSpiceDisplay *s= sd) ssd->notify++; } =20 -void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd) +void qemu_spice_cursor_refresh_unlocked(SimpleSpiceDisplay *ssd) { - dprint(3, "%s:\n", __FUNCTION__); - vga_hw_update(); - - qemu_mutex_lock(&ssd->lock); - if (ssd->update =3D=3D NULL) { - ssd->update =3D qemu_spice_create_update(ssd); - ssd->notify++; - } if (ssd->cursor) { ssd->ds->cursor_define(ssd->cursor); cursor_put(ssd->cursor); @@ -337,6 +329,19 @@ void qemu_spice_display_refresh(SimpleSpiceDisplay *= ssd) ssd->mouse_x =3D -1; ssd->mouse_y =3D -1; } +} + +void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd) +{ + dprint(3, "%s:\n", __func__); + vga_hw_update(); + + qemu_mutex_lock(&ssd->lock); + if (ssd->update =3D=3D NULL) { + ssd->update =3D qemu_spice_create_update(ssd); + ssd->notify++; + } + qemu_spice_cursor_refresh_unlocked(ssd); qemu_mutex_unlock(&ssd->lock); =20 if (ssd->notify) { diff --git a/ui/spice-display.h b/ui/spice-display.h index 5e52df9..a23bfc8 100644 --- a/ui/spice-display.h +++ b/ui/spice-display.h @@ -97,6 +97,7 @@ void qemu_spice_display_update(SimpleSpiceDisplay *ssd, int x, int y, int w, int h); void qemu_spice_display_resize(SimpleSpiceDisplay *ssd); void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd); +void qemu_spice_cursor_refresh_unlocked(SimpleSpiceDisplay *ssd); =20 void qemu_spice_add_memslot(SimpleSpiceDisplay *ssd, QXLDevMemSlot *mems= lot, qxl_async_io async); --=20 1.7.1