Skip to content

Commit

Permalink
hw/char: Have FEWatchFunc handlers return G_SOURCE_CONTINUE/REMOVE
Browse files Browse the repository at this point in the history
GLib recommend to use G_SOURCE_REMOVE / G_SOURCE_CONTINUE
for GSourceFunc callbacks. Our FEWatchFunc is a GSourceFunc
returning such value. Use such definitions which are
"more memorable" [*].

[*] https://docs.gtk.org/glib/callback.SourceFunc.html#return-value

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20230705133139.54419-5-philmd@linaro.org>
  • Loading branch information
philmd committed Aug 31, 2023
1 parent b3a1090 commit 53c7c92
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 18 deletions.
8 changes: 4 additions & 4 deletions hw/char/cadence_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -307,11 +307,11 @@ static gboolean cadence_uart_xmit(void *do_not_use, GIOCondition cond,
/* instant drain the fifo when there's no back-end */
if (!qemu_chr_fe_backend_connected(&s->chr)) {
s->tx_count = 0;
return FALSE;
return G_SOURCE_REMOVE;
}

if (!s->tx_count) {
return FALSE;
return G_SOURCE_REMOVE;
}

ret = qemu_chr_fe_write(&s->chr, s->tx_fifo, s->tx_count);
Expand All @@ -326,12 +326,12 @@ static gboolean cadence_uart_xmit(void *do_not_use, GIOCondition cond,
cadence_uart_xmit, s);
if (!r) {
s->tx_count = 0;
return FALSE;
return G_SOURCE_REMOVE;
}
}

uart_update_status(s);
return FALSE;
return G_SOURCE_REMOVE;
}

static void uart_write_tx_fifo(CadenceUARTState *s, const uint8_t *buf,
Expand Down
6 changes: 3 additions & 3 deletions hw/char/cmsdk-apb-uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ static gboolean uart_transmit(void *do_not_use, GIOCondition cond, void *opaque)
s->watch_tag = 0;

if (!(s->ctrl & R_CTRL_TX_EN_MASK) || !(s->state & R_STATE_TXFULL_MASK)) {
return FALSE;
return G_SOURCE_REMOVE;
}

ret = qemu_chr_fe_write(&s->chr, &s->txbuf, 1);
Expand All @@ -215,7 +215,7 @@ static gboolean uart_transmit(void *do_not_use, GIOCondition cond, void *opaque)
}
/* Transmit pending */
trace_cmsdk_apb_uart_tx_pending();
return FALSE;
return G_SOURCE_REMOVE;
}

buffer_drained:
Expand All @@ -227,7 +227,7 @@ static gboolean uart_transmit(void *do_not_use, GIOCondition cond, void *opaque)
s->intstatus |= R_INTSTATUS_TX_MASK;
}
cmsdk_apb_uart_update(s);
return FALSE;
return G_SOURCE_REMOVE;
}

static void uart_cancel_transmit(CMSDKAPBUART *s)
Expand Down
8 changes: 4 additions & 4 deletions hw/char/ibex_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ static gboolean ibex_uart_xmit(void *do_not_use, GIOCondition cond,
/* instant drain the fifo when there's no back-end */
if (!qemu_chr_fe_backend_connected(&s->chr)) {
s->tx_level = 0;
return FALSE;
return G_SOURCE_REMOVE;
}

if (!s->tx_level) {
Expand All @@ -156,7 +156,7 @@ static gboolean ibex_uart_xmit(void *do_not_use, GIOCondition cond,
s->uart_intr_state |= R_INTR_STATE_TX_EMPTY_MASK;
s->uart_intr_state &= ~R_INTR_STATE_TX_WATERMARK_MASK;
ibex_uart_update_irqs(s);
return FALSE;
return G_SOURCE_REMOVE;
}

ret = qemu_chr_fe_write(&s->chr, s->tx_fifo, s->tx_level);
Expand All @@ -171,7 +171,7 @@ static gboolean ibex_uart_xmit(void *do_not_use, GIOCondition cond,
ibex_uart_xmit, s);
if (!r) {
s->tx_level = 0;
return FALSE;
return G_SOURCE_REMOVE;
}
}

Expand All @@ -192,7 +192,7 @@ static gboolean ibex_uart_xmit(void *do_not_use, GIOCondition cond,
}

ibex_uart_update_irqs(s);
return FALSE;
return G_SOURCE_REMOVE;
}

static void uart_write_tx_fifo(IbexUartState *s, const uint8_t *buf,
Expand Down
4 changes: 2 additions & 2 deletions hw/char/nrf51_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ static gboolean uart_transmit(void *do_not_use, GIOCondition cond, void *opaque)
*/
goto buffer_drained;
}
return FALSE;
return G_SOURCE_REMOVE;
}

buffer_drained:
s->reg[R_UART_TXDRDY] = 1;
s->pending_tx_byte = false;
return FALSE;
return G_SOURCE_REMOVE;
}

static void uart_cancel_transmit(NRF51UARTState *s)
Expand Down
2 changes: 1 addition & 1 deletion hw/char/serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ static gboolean serial_watch_cb(void *do_not_use, GIOCondition cond,
SerialState *s = opaque;
s->watch_tag = 0;
serial_xmit(s);
return FALSE;
return G_SOURCE_REMOVE;
}

static void serial_xmit(SerialState *s)
Expand Down
2 changes: 1 addition & 1 deletion hw/char/virtio-console.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static gboolean chr_write_unblocked(void *do_not_use, GIOCondition cond,

vcon->watch = 0;
virtio_serial_throttle_port(VIRTIO_SERIAL_PORT(vcon), false);
return FALSE;
return G_SOURCE_REMOVE;
}

/* Callback function that's called when the guest sends us data */
Expand Down
2 changes: 1 addition & 1 deletion hw/usb/redirect.c
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ static gboolean usbredir_write_unblocked(void *do_not_use, GIOCondition cond,
dev->watch = 0;
usbredirparser_do_write(dev->parser);

return FALSE;
return G_SOURCE_REMOVE;
}

static int usbredir_write(void *priv, uint8_t *data, int count)
Expand Down
2 changes: 1 addition & 1 deletion monitor/monitor.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ static gboolean monitor_unblocked(void *do_not_use, GIOCondition cond,
QEMU_LOCK_GUARD(&mon->mon_lock);
mon->out_watch = 0;
monitor_flush_locked(mon);
return FALSE;
return G_SOURCE_REMOVE;
}

/* Caller must hold mon->mon_lock */
Expand Down
2 changes: 1 addition & 1 deletion net/vhost-user.c
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ static gboolean net_vhost_user_watch(void *do_not_use, GIOCondition cond,

qemu_chr_fe_disconnect(&s->chr);

return TRUE;
return G_SOURCE_CONTINUE;
}

static void net_vhost_user_event(void *opaque, QEMUChrEvent event);
Expand Down

0 comments on commit 53c7c92

Please sign in to comment.