16550A UART: RHR irq enable bit also masks the Rx timeout irq.

[qemu] / hw / serial.c

diff --git a/hw/serial.c b/hw/serial.c
index d70207e..28d99f2 100644 (file)
--- a/hw/serial.c
+++ b/hw/serial.c
@@ -191,7 +191,7 @@ static void serial_update_irq(SerialState *s)
 
     if ((s->ier & UART_IER_RLSI) && (s->lsr & UART_LSR_INT_ANY)) {
         tmp_iir = UART_IIR_RLSI;
-    } else if (s->timeout_ipending) {
+    } else if ((s->ier & UART_IER_RDI) && s->timeout_ipending) {
         tmp_iir = UART_IIR_CTI;
     } else if ((s->ier & UART_IER_RDI) && (s->lsr & UART_LSR_DR)) {
         if (!(s->fcr & UART_FCR_FE)) {