From fdb2ed44f1bf3568f12858c5752dc5d3add57945 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 22 Dec 2014 08:51:57 +0100 Subject: [PATCH] serial: refine serial_thr_ipending_needed If the THR interrupt is disabled, there is no need to migrate thr_ipending because LSR.THRE will be sampled again when the interrupt is enabled. (This is the behavior that is not documented in the datasheet, but relied on by Windows!) Note that in this case IIR will never be 0x2 so, if thr_ipending were to be one, QEMU would produce the subsection. Reported-by: Igor Mammedov Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini (cherry picked from commit bfa7362889d05d6951493d1c298289b39cf9bf86) Signed-off-by: Michael Roth --- hw/char/serial.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 8c42d03fa..51d939e53 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -637,8 +637,17 @@ static int serial_post_load(void *opaque, int version_id) static bool serial_thr_ipending_needed(void *opaque) { SerialState *s = opaque; - bool expected_value = ((s->iir & UART_IIR_ID) == UART_IIR_THRI); - return s->thr_ipending != expected_value; + + if (s->ier & UART_IER_THRI) { + bool expected_value = ((s->iir & UART_IIR_ID) == UART_IIR_THRI); + return s->thr_ipending != expected_value; + } else { + /* LSR.THRE will be sampled again when the interrupt is + * enabled. thr_ipending is not used in this case, do + * not migrate it. + */ + return false; + } } const VMStateDescription vmstate_serial_thr_ipending = { -- 2.39.5