summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2013-09-08 00:39:05 -0700
committerMichael Tokarev <mjt@tls.msk.ru>2013-10-02 22:55:28 +0400
commit84faf7c3927ca7f3013362e38c58c02a7e733c0c (patch)
tree5ae8d2f78397e40d5f06fca9f2484dcfb0813ffc
parent9b2caaf40bd667492b4e6228dd3d1f5e44083456 (diff)
downloadfocaccia-qemu-84faf7c3927ca7f3013362e38c58c02a7e733c0c.tar.gz
focaccia-qemu-84faf7c3927ca7f3013362e38c58c02a7e733c0c.zip
sh4: Fix serial line access for Linux kernels later than 3.2
With Linux kernel version 3.3 or later, qemu fails with the following message:

sh_serial: unsupported read from 0x18
  Aborted

Reported-and-analyzed-by: Rob Landley <rob@landley.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rw-r--r--hw/char/sh_serial.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index 6223a557b2..9328dd1b57 100644
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -248,11 +248,9 @@ static uint64_t sh_serial_read(void *opaque, hwaddr offs,
                     s->flags &= ~SH_SERIAL_FLAG_RDF;
             }
             break;
-#if 0
         case 0x18:
             ret = s->fcr;
             break;
-#endif
         case 0x1c:
             ret = s->rx_cnt;
             break;