Commit ec9fe956 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a4b31047 af35e5e1

hw/char/cadence_uart.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

    }

hw/char/serial.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }

hw/char/virtio-console.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

            }

        }

hw/usb/redirect.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

monitor.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }