mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui: rename cursor_{put->unref}

Browse Source 
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:
Marc-André Lureau 2023-01-17 15:07:02 +04:00
parent 1222070e77
commit f4579e2899
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/display/qxl-render.c
View File

@ -290,7 +290,7 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor,
return c; return c;
fail: fail:
cursor_put(c); cursor_unref(c);
return NULL; return NULL;
} }
@ -336,7 +336,7 @@ int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext)
} }
qemu_mutex_lock(&qxl->ssd.lock); qemu_mutex_lock(&qxl->ssd.lock);
if (qxl->ssd.cursor) { if (qxl->ssd.cursor) {
cursor_put(qxl->ssd.cursor); cursor_unref(qxl->ssd.cursor);
} }
qxl->ssd.cursor = c; qxl->ssd.cursor = c;
qxl->ssd.mouse_x = cmd->u.set.position.x; qxl->ssd.mouse_x = cmd->u.set.position.x;

2
hw/display/qxl.c
View File

@ -299,7 +299,7 @@ void qxl_spice_reset_cursor(PCIQXLDevice *qxl)
qxl->guest_cursor = 0; qxl->guest_cursor = 0;
qemu_mutex_unlock(&qxl->track_lock); qemu_mutex_unlock(&qxl->track_lock);
if (qxl->ssd.cursor) { if (qxl->ssd.cursor) {
cursor_put(qxl->ssd.cursor); cursor_unref(qxl->ssd.cursor);
} }
qxl->ssd.cursor = cursor_builtin_hidden(); qxl->ssd.cursor = cursor_builtin_hidden();
} }

4
hw/display/vmware_vga.c
View File

@ -550,12 +550,12 @@ static inline void vmsvga_cursor_define(struct vmsvga_state_s *s,
default: default:
fprintf(stderr, "%s: unhandled bpp %d, using fallback cursor\n", fprintf(stderr, "%s: unhandled bpp %d, using fallback cursor\n",
__func__, c->bpp); __func__, c->bpp);
cursor_put(qc); cursor_unref(qc);
qc = cursor_builtin_left_ptr(); qc = cursor_builtin_left_ptr();
} }
dpy_cursor_define(s->vga.con, qc); dpy_cursor_define(s->vga.con, qc);
cursor_put(qc); cursor_unref(qc);
} }
#endif #endif

2
include/ui/console.h
View File

@ -152,7 +152,7 @@ typedef struct QEMUCursor {
QEMUCursor *cursor_alloc(int width, int height); QEMUCursor *cursor_alloc(int width, int height);
void cursor_get(QEMUCursor *c); void cursor_get(QEMUCursor *c);
void cursor_put(QEMUCursor *c); void cursor_unref(QEMUCursor *c);
QEMUCursor *cursor_builtin_hidden(void); QEMUCursor *cursor_builtin_hidden(void);
QEMUCursor *cursor_builtin_left_ptr(void); QEMUCursor *cursor_builtin_left_ptr(void);
void cursor_print_ascii_art(QEMUCursor *c, const char *prefix); void cursor_print_ascii_art(QEMUCursor *c, const char *prefix);

2
ui/cursor.c
View File

@ -111,7 +111,7 @@ void cursor_get(QEMUCursor *c)
c->refcount++; c->refcount++;
} }
void cursor_put(QEMUCursor *c) void cursor_unref(QEMUCursor *c)
{ {
if (c == NULL) if (c == NULL)
return; return;

2
ui/dbus-listener.c
View File

@ -345,7 +345,7 @@ static void dbus_cursor_define(DisplayChangeListener *dcl,
c->data, c->data,
c->width * c->height * 4, c->width * c->height * 4,
TRUE, TRUE,
(GDestroyNotify)cursor_put, (GDestroyNotify)cursor_unref,
c); c);
qemu_dbus_display1_listener_call_cursor_define( qemu_dbus_display1_listener_call_cursor_define(

4
ui/spice-display.c
View File

@ -464,7 +464,7 @@ void qemu_spice_cursor_refresh_bh(void *opaque)
qemu_mutex_unlock(&ssd->lock); qemu_mutex_unlock(&ssd->lock);
dpy_cursor_define(ssd->dcl.con, c); dpy_cursor_define(ssd->dcl.con, c);
qemu_mutex_lock(&ssd->lock); qemu_mutex_lock(&ssd->lock);
cursor_put(c); cursor_unref(c);
} }
if (ssd->mouse_x != -1 && ssd->mouse_y != -1) { 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); qemu_mutex_lock(&ssd->lock);
cursor_get(c); cursor_get(c);
cursor_put(ssd->cursor); cursor_unref(ssd->cursor);
ssd->cursor = c; ssd->cursor = c;
ssd->hot_x = c->hot_x; ssd->hot_x = c->hot_x;
ssd->hot_y = c->hot_y; ssd->hot_y = c->hot_y;

2
ui/vnc.c
View File

@ -1029,7 +1029,7 @@ static void vnc_dpy_cursor_define(DisplayChangeListener *dcl,
VncDisplay *vd = container_of(dcl, VncDisplay, dcl); VncDisplay *vd = container_of(dcl, VncDisplay, dcl);
VncState *vs; VncState *vs;
cursor_put(vd->cursor); cursor_unref(vd->cursor);
g_free(vd->cursor_mask); g_free(vd->cursor_mask);
vd->cursor = c; vd->cursor = c;