starred/qemu-qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:46:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

io: use g_clear_handle_id() for GSource cleanup

Browse Source 
Use g_clear_handle_id() instead of g_source_remove() with
manual ID checking and zeroing.

This simplifies the code and ensures consistent handling of
GSource IDs, since g_clear_handle_id() checks for a non-zero
ID before calling the cleanup function and zeros it afterwards.

No functional change intended.

Mechanical change using the following Coccinelle spatch script:

  @@
  expression TAG;
  @@
  -    if (TAG > 0) {
  +    if (TAG) {
           g_source_remove(TAG);
           <... when != TAG
           TAG = 0;
           ...>
       }

  @@
  expression TAG;
  @@
  -    g_source_remove(TAG);
  -    TAG = 0;
  +    g_clear_handle_id(&TAG, g_source_remove);

  @@
  expression TAG;
  @@
  -    if (TAG) {
           g_clear_handle_id(&TAG, g_source_remove);
  -    }

Inspired-by: Matthew Penney <matt@matthewpenney.net>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Matthew Penney <matt@matthewpenney.net>
Message-Id: <20260408100605.66795-3-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé
2026-04-08 11:52:26 +02:00
parent f378a25b16
commit 11a64a4b7c
16 changed files with 25 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hw/char/cmsdk-apb-uart.c
View File

@@ -236,10 +236,7 @@ buffer_drained:
static void uart_cancel_transmit(CMSDKAPBUART *s)
{
if (s->watch_tag) {
g_source_remove(s->watch_tag);
s->watch_tag = 0;
}
g_clear_handle_id(&s->watch_tag, g_source_remove);
}
static void uart_write(void *opaque, hwaddr offset, uint64_t value,

5
hw/char/nrf51_uart.c
View File

@@ -104,10 +104,7 @@ buffer_drained:
static void uart_cancel_transmit(NRF51UARTState *s)
{
if (s->watch_tag) {
g_source_remove(s->watch_tag);
s->watch_tag = 0;
}
g_clear_handle_id(&s->watch_tag, g_source_remove);
}
static void uart_write(void *opaque, hwaddr addr,

6
hw/char/serial.c
View File

@@ -856,11 +856,7 @@ const VMStateDescription vmstate_serial = {
static void serial_reset(void *opaque)
{
SerialState *s = opaque;
if (s->watch_tag > 0) {
g_source_remove(s->watch_tag);
s->watch_tag = 0;
}
g_clear_handle_id(&s->watch_tag, g_source_remove);
s->rbr = 0;
s->ier = 0;

5
hw/char/stm32l4x5_usart.c
View File

@@ -280,10 +280,7 @@ buffer_drained:
static void usart_cancel_transmit(Stm32l4x5UsartBaseState *s)
{
if (s->watch_tag) {
g_source_remove(s->watch_tag);
s->watch_tag = 0;
}
g_clear_handle_id(&s->watch_tag, g_source_remove);
}
static void stm32l4x5_update_params(Stm32l4x5UsartBaseState *s)

5
hw/char/terminal3270.c
View File

@@ -52,10 +52,7 @@ static int terminal_can_read(void *opaque)
static void terminal_timer_cancel(Terminal3270 *t)
{
if (t->timer_tag) {
g_source_remove(t->timer_tag);
t->timer_tag = 0;
}
g_clear_handle_id(&t->timer_tag, g_source_remove);
}
/*

10
hw/char/virtio-console.c
View File

@@ -159,10 +159,7 @@ static void chr_event(void *opaque, QEMUChrEvent event)
virtio_serial_open(port);
break;
case CHR_EVENT_CLOSED:
if (vcon->watch) {
g_source_remove(vcon->watch);
vcon->watch = 0;
}
g_clear_handle_id(&vcon->watch, g_source_remove);
virtio_serial_close(port);
break;
case CHR_EVENT_BREAK:
@@ -255,10 +252,7 @@ static void virtconsole_realize(DeviceState *dev, Error **errp)
static void virtconsole_unrealize(DeviceState *dev)
{
VirtConsole *vcon = VIRTIO_CONSOLE(dev);
if (vcon->watch) {
g_clear_handle_id(&vcon->watch, g_source_remove);
}
g_clear_handle_id(&vcon->watch, g_source_remove);
}
static void virtconsole_class_init(ObjectClass *klass, const void *data)

5
hw/usb/redirect.c
View File

@@ -1226,10 +1226,7 @@ static void usbredir_chardev_close_bh(void *opaque)
usbredirparser_destroy(dev->parser);
dev->parser = NULL;
}
if (dev->watch) {
g_source_remove(dev->watch);
dev->watch = 0;
}
g_clear_handle_id(&dev->watch, g_source_remove);
}
static void usbredir_create_parser(USBRedirDevice *dev)

13
io/channel-websock.c
View File

@@ -1066,10 +1066,7 @@ static gboolean qio_channel_websock_flush(QIOChannel *ioc,
static void qio_channel_websock_unset_watch(QIOChannelWebsock *ioc)
{
if (ioc->io_tag) {
g_source_remove(ioc->io_tag);
ioc->io_tag = 0;
}
g_clear_handle_id(&ioc->io_tag, g_source_remove);
}
static void qio_channel_websock_set_watch(QIOChannelWebsock *ioc)
@@ -1246,12 +1243,8 @@ static int qio_channel_websock_close(QIOChannel *ioc,
buffer_free(&wioc->encinput);
buffer_free(&wioc->encoutput);
buffer_free(&wioc->rawinput);
if (wioc->hs_io_tag) {
g_clear_handle_id(&wioc->hs_io_tag, g_source_remove);
}
if (wioc->io_tag) {
g_clear_handle_id(&wioc->io_tag, g_source_remove);
}
g_clear_handle_id(&wioc->hs_io_tag, g_source_remove);
g_clear_handle_id(&wioc->io_tag, g_source_remove);
if (wioc->io_err) {
g_clear_pointer(&wioc->io_err, error_free);
}

8
net/passt.c
View File

@@ -90,10 +90,7 @@ static void net_passt_cleanup(NetClientState *nc)
g_free(s->vhost_net);
s->vhost_net = NULL;
}
if (s->vhost_watch) {
g_source_remove(s->vhost_watch);
s->vhost_watch = 0;
}
g_clear_handle_id(&s->vhost_watch, g_source_remove);
qemu_chr_fe_deinit(&s->vhost_chr, true);
if (s->vhost_user) {
vhost_user_cleanup(s->vhost_user);
@@ -421,8 +418,7 @@ static void passt_vhost_user_event(void *opaque, QEMUChrEvent event)
if (s->vhost_watch) {
AioContext *ctx = qemu_get_current_aio_context();
g_source_remove(s->vhost_watch);
s->vhost_watch = 0;
g_clear_handle_id(&s->vhost_watch, g_source_remove);
qemu_chr_fe_set_handlers(&s->vhost_chr, NULL, NULL, NULL, NULL,
NULL, NULL, false);

15
net/stream.c
View File

@@ -71,24 +71,15 @@ static gboolean net_stream_send(QIOChannel *ioc,
static void net_stream_cleanup(NetClientState *nc)
{
NetStreamState *s = DO_UPCAST(NetStreamState, data.nc, nc);
if (s->timer_tag) {
g_source_remove(s->timer_tag);
s->timer_tag = 0;
}
g_clear_handle_id(&s->timer_tag, g_source_remove);
if (s->addr) {
qapi_free_SocketAddress(s->addr);
s->addr = NULL;
}
if (s->data.ioc) {
if (QIO_CHANNEL_SOCKET(s->data.ioc)->fd != -1) {
if (s->data.ioc_read_tag) {
g_source_remove(s->data.ioc_read_tag);
s->data.ioc_read_tag = 0;
}
if (s->data.ioc_write_tag) {
g_source_remove(s->data.ioc_write_tag);
s->data.ioc_write_tag = 0;
}
g_clear_handle_id(&s->data.ioc_read_tag, g_source_remove);
g_clear_handle_id(&s->data.ioc_write_tag, g_source_remove);
}
object_unref(OBJECT(s->data.ioc));
s->data.ioc = NULL;

5
net/stream_data.c
View File

@@ -84,10 +84,7 @@ void net_stream_data_rs_finalize(SocketReadState *rs)
if (qemu_send_packet_async(&d->nc, rs->buf,
rs->packet_len,
net_stream_data_send_completed) == 0) {
if (d->ioc_read_tag) {
g_source_remove(d->ioc_read_tag);
d->ioc_read_tag = 0;
}
g_clear_handle_id(&d->ioc_read_tag, g_source_remove);
}
}

8
net/vhost-user.c
View File

@@ -215,10 +215,7 @@ static void net_vhost_user_cleanup(NetClientState *nc)
s->vhost_net = NULL;
}
if (nc->queue_index == 0) {
if (s->watch) {
g_source_remove(s->watch);
s->watch = 0;
}
g_clear_handle_id(&s->watch, g_source_remove);
qemu_chr_fe_deinit(&s->chr, true);
if (s->vhost_user) {
vhost_user_cleanup(s->vhost_user);
@@ -356,8 +353,7 @@ static void net_vhost_user_event(void *opaque, QEMUChrEvent event)
if (s->watch) {
AioContext *ctx = qemu_get_current_aio_context();
g_source_remove(s->watch);
s->watch = 0;
g_clear_handle_id(&s->watch, g_source_remove);
qemu_chr_fe_set_handlers(&s->chr, NULL, NULL, NULL, NULL,
NULL, NULL, false);

6
ui/dbus-clipboard.c
View File

@@ -80,8 +80,7 @@ dbus_clipboard_update_info(DBusDisplay *dpy, QemuClipboardInfo *info)
if (req->invocation && info->types[req->type].data) {
dbus_clipboard_complete_request(dpy, req->invocation, info, req->type);
g_clear_object(&req->invocation);
g_source_remove(req->timeout_id);
req->timeout_id = 0;
g_clear_handle_id(&req->timeout_id, g_source_remove);
return;
}
@@ -183,8 +182,7 @@ dbus_clipboard_request_cancelled(DBusClipboardRequest *req)
"Cancelled clipboard request");
g_clear_object(&req->invocation);
g_source_remove(req->timeout_id);
req->timeout_id = 0;
g_clear_handle_id(&req->timeout_id, g_source_remove);
}
static void

6
ui/input-barrier.c
View File

@@ -518,11 +518,7 @@ static void input_barrier_complete(UserCreatable *uc, Error **errp)
static void input_barrier_instance_finalize(Object *obj)
{
InputBarrier *ib = INPUT_BARRIER(obj);
if (ib->ioc_tag) {
g_source_remove(ib->ioc_tag);
ib->ioc_tag = 0;
}
g_clear_handle_id(&ib->ioc_tag, g_source_remove);
if (ib->sioc) {
qio_channel_close(QIO_CHANNEL(ib->sioc), NULL);

6
ui/vnc-auth-vencrypt.c
View File

@@ -101,11 +101,7 @@ static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len
QIOChannelTLS *tls;
vnc_write_u8(vs, 1); /* Accept auth */
vnc_flush(vs);
if (vs->ioc_tag) {
g_source_remove(vs->ioc_tag);
vs->ioc_tag = 0;
}
g_clear_handle_id(&vs->ioc_tag, g_source_remove);
tls = qio_channel_tls_new_server(
vs->ioc,

12
ui/vnc-ws.c
View File

@@ -54,11 +54,7 @@ gboolean vncws_tls_handshake_io(QIOChannel *ioc G_GNUC_UNUSED,
VncState *vs = opaque;
QIOChannelTLS *tls;
Error *err = NULL;
if (vs->ioc_tag) {
g_source_remove(vs->ioc_tag);
vs->ioc_tag = 0;
}
g_clear_handle_id(&vs->ioc_tag, g_source_remove);
if (condition & (G_IO_HUP | G_IO_ERR)) {
vnc_client_error(vs);
@@ -123,11 +119,7 @@ gboolean vncws_handshake_io(QIOChannel *ioc G_GNUC_UNUSED,
{
VncState *vs = opaque;
QIOChannelWebsock *wioc;
if (vs->ioc_tag) {
g_source_remove(vs->ioc_tag);
vs->ioc_tag = 0;
}
g_clear_handle_id(&vs->ioc_tag, g_source_remove);
if (condition & (G_IO_HUP | G_IO_ERR)) {
vnc_client_error(vs);