qxl: fix spice+sdl no cursor regression
regression introduced by 0753609458
,
v2: lock around qemu_spice_cursor_refresh_unlocked
Reported-by: Fabiano Fidêncio <fabiano@fidencio.org>
Signed-off-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
b4bd0b168e
commit
bb5a8cd5b0
4
hw/qxl.c
4
hw/qxl.c
|
@ -1545,6 +1545,10 @@ static void display_refresh(struct DisplayState *ds)
|
||||||
{
|
{
|
||||||
if (qxl0->mode == QXL_MODE_VGA) {
|
if (qxl0->mode == QXL_MODE_VGA) {
|
||||||
qemu_spice_display_refresh(&qxl0->ssd);
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -317,16 +317,8 @@ void qemu_spice_display_resize(SimpleSpiceDisplay *ssd)
|
||||||
ssd->notify++;
|
ssd->notify++;
|
||||||
}
|
}
|
||||||
|
|
||||||
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 == NULL) {
|
|
||||||
ssd->update = qemu_spice_create_update(ssd);
|
|
||||||
ssd->notify++;
|
|
||||||
}
|
|
||||||
if (ssd->cursor) {
|
if (ssd->cursor) {
|
||||||
ssd->ds->cursor_define(ssd->cursor);
|
ssd->ds->cursor_define(ssd->cursor);
|
||||||
cursor_put(ssd->cursor);
|
cursor_put(ssd->cursor);
|
||||||
|
@ -337,6 +329,19 @@ void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd)
|
||||||
ssd->mouse_x = -1;
|
ssd->mouse_x = -1;
|
||||||
ssd->mouse_y = -1;
|
ssd->mouse_y = -1;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd)
|
||||||
|
{
|
||||||
|
dprint(3, "%s:\n", __func__);
|
||||||
|
vga_hw_update();
|
||||||
|
|
||||||
|
qemu_mutex_lock(&ssd->lock);
|
||||||
|
if (ssd->update == NULL) {
|
||||||
|
ssd->update = qemu_spice_create_update(ssd);
|
||||||
|
ssd->notify++;
|
||||||
|
}
|
||||||
|
qemu_spice_cursor_refresh_unlocked(ssd);
|
||||||
qemu_mutex_unlock(&ssd->lock);
|
qemu_mutex_unlock(&ssd->lock);
|
||||||
|
|
||||||
if (ssd->notify) {
|
if (ssd->notify) {
|
||||||
|
|
|
@ -97,6 +97,7 @@ void qemu_spice_display_update(SimpleSpiceDisplay *ssd,
|
||||||
int x, int y, int w, int h);
|
int x, int y, int w, int h);
|
||||||
void qemu_spice_display_resize(SimpleSpiceDisplay *ssd);
|
void qemu_spice_display_resize(SimpleSpiceDisplay *ssd);
|
||||||
void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd);
|
void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd);
|
||||||
|
void qemu_spice_cursor_refresh_unlocked(SimpleSpiceDisplay *ssd);
|
||||||
|
|
||||||
void qemu_spice_add_memslot(SimpleSpiceDisplay *ssd, QXLDevMemSlot *memslot,
|
void qemu_spice_add_memslot(SimpleSpiceDisplay *ssd, QXLDevMemSlot *memslot,
|
||||||
qxl_async_io async);
|
qxl_async_io async);
|
||||||
|
|
Loading…
Reference in a new issue