ui: rename cursor_{put->unref}
The naming is more conventional in QEMU. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
1222070e77
commit
f4579e2899
|
@ -290,7 +290,7 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor,
|
|||
return c;
|
||||
|
||||
fail:
|
||||
cursor_put(c);
|
||||
cursor_unref(c);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -336,7 +336,7 @@ int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext)
|
|||
}
|
||||
qemu_mutex_lock(&qxl->ssd.lock);
|
||||
if (qxl->ssd.cursor) {
|
||||
cursor_put(qxl->ssd.cursor);
|
||||
cursor_unref(qxl->ssd.cursor);
|
||||
}
|
||||
qxl->ssd.cursor = c;
|
||||
qxl->ssd.mouse_x = cmd->u.set.position.x;
|
||||
|
|
|
@ -299,7 +299,7 @@ void qxl_spice_reset_cursor(PCIQXLDevice *qxl)
|
|||
qxl->guest_cursor = 0;
|
||||
qemu_mutex_unlock(&qxl->track_lock);
|
||||
if (qxl->ssd.cursor) {
|
||||
cursor_put(qxl->ssd.cursor);
|
||||
cursor_unref(qxl->ssd.cursor);
|
||||
}
|
||||
qxl->ssd.cursor = cursor_builtin_hidden();
|
||||
}
|
||||
|
|
|
@ -550,12 +550,12 @@ static inline void vmsvga_cursor_define(struct vmsvga_state_s *s,
|
|||
default:
|
||||
fprintf(stderr, "%s: unhandled bpp %d, using fallback cursor\n",
|
||||
__func__, c->bpp);
|
||||
cursor_put(qc);
|
||||
cursor_unref(qc);
|
||||
qc = cursor_builtin_left_ptr();
|
||||
}
|
||||
|
||||
dpy_cursor_define(s->vga.con, qc);
|
||||
cursor_put(qc);
|
||||
cursor_unref(qc);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -152,7 +152,7 @@ typedef struct QEMUCursor {
|
|||
|
||||
QEMUCursor *cursor_alloc(int width, int height);
|
||||
void cursor_get(QEMUCursor *c);
|
||||
void cursor_put(QEMUCursor *c);
|
||||
void cursor_unref(QEMUCursor *c);
|
||||
QEMUCursor *cursor_builtin_hidden(void);
|
||||
QEMUCursor *cursor_builtin_left_ptr(void);
|
||||
void cursor_print_ascii_art(QEMUCursor *c, const char *prefix);
|
||||
|
|
|
@ -111,7 +111,7 @@ void cursor_get(QEMUCursor *c)
|
|||
c->refcount++;
|
||||
}
|
||||
|
||||
void cursor_put(QEMUCursor *c)
|
||||
void cursor_unref(QEMUCursor *c)
|
||||
{
|
||||
if (c == NULL)
|
||||
return;
|
||||
|
|
|
@ -345,7 +345,7 @@ static void dbus_cursor_define(DisplayChangeListener *dcl,
|
|||
c->data,
|
||||
c->width * c->height * 4,
|
||||
TRUE,
|
||||
(GDestroyNotify)cursor_put,
|
||||
(GDestroyNotify)cursor_unref,
|
||||
c);
|
||||
|
||||
qemu_dbus_display1_listener_call_cursor_define(
|
||||
|
|
|
@ -464,7 +464,7 @@ void qemu_spice_cursor_refresh_bh(void *opaque)
|
|||
qemu_mutex_unlock(&ssd->lock);
|
||||
dpy_cursor_define(ssd->dcl.con, c);
|
||||
qemu_mutex_lock(&ssd->lock);
|
||||
cursor_put(c);
|
||||
cursor_unref(c);
|
||||
}
|
||||
|
||||
if (ssd->mouse_x != -1 && ssd->mouse_y != -1) {
|
||||
|
@ -766,7 +766,7 @@ static void display_mouse_define(DisplayChangeListener *dcl,
|
|||
|
||||
qemu_mutex_lock(&ssd->lock);
|
||||
cursor_get(c);
|
||||
cursor_put(ssd->cursor);
|
||||
cursor_unref(ssd->cursor);
|
||||
ssd->cursor = c;
|
||||
ssd->hot_x = c->hot_x;
|
||||
ssd->hot_y = c->hot_y;
|
||||
|
|
Loading…
Reference in New Issue