diff options
| author | Peter Crosthwaite <peter.crosthwaite@xilinx.com> | 2013-07-15 12:28:07 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2013-07-15 12:28:07 +0100 |
| commit | 9121d02cb33c96b444a3973579f5edc119597e81 (patch) | |
| tree | d26a16a8ae415a20b2bf48016474441953ae0b00 /hw/char/cadence_uart.c | |
| parent | c3cb8e77804313e1be99b5f28a34a346736707a5 (diff) | |
| download | focaccia-qemu-9121d02cb33c96b444a3973579f5edc119597e81.tar.gz focaccia-qemu-9121d02cb33c96b444a3973579f5edc119597e81.zip | |
char/cadence_uart: Fix reset for unattached instances
commit 1db8b5efe0c2b5000e50691eea61264a615f43de introduced an issue where QEMU would segfault if you have an unattached Cadence UART. Fix by guarding the flush-on-reset logic on there being a qemu_chr attachment. Reported-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Tested-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Message-id: 9009578ee10a50d994b2e10aa2840d73765f5968.1370577272.git.peter.crosthwaite@xilinx.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/char/cadence_uart.c')
| -rw-r--r-- | hw/char/cadence_uart.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index 131370a74b..4d457f8c65 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -157,7 +157,9 @@ static void uart_rx_reset(UartState *s) { s->rx_wpos = 0; s->rx_count = 0; - qemu_chr_accept_input(s->chr); + if (s->chr) { + qemu_chr_accept_input(s->chr); + } s->r[R_SR] |= UART_SR_INTR_REMPTY; s->r[R_SR] &= ~UART_SR_INTR_RFUL; |