Commit 9f34a35e authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

serial: reinstate watch after migration 



Otherwise, a serial port can get stuck if it is migrated while flow control
is in effect.

Tested-by: default avatarBret Ketchum <bcketchum@gmail.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a1df76da

hw/char/serial.c

+23 −2
Original line number Diff line number Diff line
@@ -644,10 +644,31 @@ static int serial_post_load(void *opaque, int version_id) 
    if (s->thr_ipending == -1) {

        s->thr_ipending = ((s->iir & UART_IIR_ID) == UART_IIR_THRI);

    }



    if (s->tsr_retry > 0) {

        /* tsr_retry > 0 implies LSR.TEMT = 0 (transmitter not empty).  */

        if (s->lsr & UART_LSR_TEMT) {

            error_report("inconsistent state in serial device "

                         "(tsr empty, tsr_retry=%d", s->tsr_retry);

            return -1;

        }



        if (s->tsr_retry > MAX_XMIT_RETRY) {

            s->tsr_retry = MAX_XMIT_RETRY;

        }



        assert(s->watch_tag == 0);

        s->watch_tag = qemu_chr_fe_add_watch(s->chr, G_IO_OUT|G_IO_HUP,

                                             serial_watch_cb, s);

    } else {

        /* tsr_retry == 0 implies LSR.TEMT = 1 (transmitter empty).  */

        if (!(s->lsr & UART_LSR_TEMT)) {

            error_report("inconsistent state in serial device "

                         "(tsr not empty, tsr_retry=0");

            return -1;

        }

    }



    s->last_break_enable = (s->lcr >> 6) & 1;

    /* Initialize fcr via setter to perform essential side-effects */

    serial_write_fcr(s, s->fcr_vmstate);