Merge remote-tracking branch 'remotes/bonzini/small-fixes' into staging
* remotes/bonzini/small-fixes: tests/test-qmp-event: fix for GLib < 2.31 serial: poll the serial console with G_IO_HUP Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
ec9fe956d5
|
@ -306,7 +306,8 @@ static gboolean cadence_uart_xmit(GIOChannel *chan, GIOCondition cond,
|
|||
memmove(s->tx_fifo, s->tx_fifo + ret, s->tx_count);
|
||||
|
||||
if (s->tx_count) {
|
||||
int r = qemu_chr_fe_add_watch(s->chr, G_IO_OUT, cadence_uart_xmit, s);
|
||||
int r = qemu_chr_fe_add_watch(s->chr, G_IO_OUT|G_IO_HUP,
|
||||
cadence_uart_xmit, s);
|
||||
assert(r);
|
||||
}
|
||||
|
||||
|
|
|
@ -246,7 +246,7 @@ static gboolean serial_xmit(GIOChannel *chan, GIOCondition cond, void *opaque)
|
|||
serial_receive1(s, &s->tsr, 1);
|
||||
} else if (qemu_chr_fe_write(s->chr, &s->tsr, 1) != 1) {
|
||||
if (s->tsr_retry >= 0 && s->tsr_retry < MAX_XMIT_RETRY &&
|
||||
qemu_chr_fe_add_watch(s->chr, G_IO_OUT, serial_xmit, s) > 0) {
|
||||
qemu_chr_fe_add_watch(s->chr, G_IO_OUT|G_IO_HUP, serial_xmit, s) > 0) {
|
||||
s->tsr_retry++;
|
||||
return FALSE;
|
||||
}
|
||||
|
|
|
@ -70,7 +70,8 @@ static ssize_t flush_buf(VirtIOSerialPort *port,
|
|||
if (!k->is_console) {
|
||||
virtio_serial_throttle_port(port, true);
|
||||
if (!vcon->watch) {
|
||||
vcon->watch = qemu_chr_fe_add_watch(vcon->chr, G_IO_OUT,
|
||||
vcon->watch = qemu_chr_fe_add_watch(vcon->chr,
|
||||
G_IO_OUT|G_IO_HUP,
|
||||
chr_write_unblocked, vcon);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -290,7 +290,7 @@ static int usbredir_write(void *priv, uint8_t *data, int count)
|
|||
r = qemu_chr_fe_write(dev->cs, data, count);
|
||||
if (r < count) {
|
||||
if (!dev->watch) {
|
||||
dev->watch = qemu_chr_fe_add_watch(dev->cs, G_IO_OUT,
|
||||
dev->watch = qemu_chr_fe_add_watch(dev->cs, G_IO_OUT|G_IO_HUP,
|
||||
usbredir_write_unblocked, dev);
|
||||
}
|
||||
if (r < 0) {
|
||||
|
|
|
@ -321,7 +321,7 @@ static void monitor_flush_locked(Monitor *mon)
|
|||
mon->outbuf = tmp;
|
||||
}
|
||||
if (mon->out_watch == 0) {
|
||||
mon->out_watch = qemu_chr_fe_add_watch(mon->chr, G_IO_OUT,
|
||||
mon->out_watch = qemu_chr_fe_add_watch(mon->chr, G_IO_OUT|G_IO_HUP,
|
||||
monitor_unblocked, mon);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -251,6 +251,12 @@ static void test_event_d(TestEventData *data,
|
|||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
#if !GLIB_CHECK_VERSION(2, 31, 0)
|
||||
if (!g_thread_supported()) {
|
||||
g_thread_init(NULL);
|
||||
}
|
||||
#endif
|
||||
|
||||
qmp_event_set_func_emit(event_test_emit);
|
||||
|
||||
g_test_init(&argc, &argv, NULL);
|
||||
|
|
Loading…
Reference in a new issue