[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/6] hw/pc.c: Fix converting of ioport_register* to
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 6/6] hw/pc.c: Fix converting of ioport_register* to MemoryRegion |
Date: |
Fri, 11 Jan 2013 10:18:06 +0100 |
From: Julien Grall <address@hidden>
The commit 258711 introduced MemoryRegion to replace ioport_region*
for ioport 80h and F0h.
A MemoryRegion needs to have both read and write callback otherwise a segfault
will occur when an access is made.
The previous behaviour of this both ioport is to return 0xffffffffffffffff.
So keep this behaviour.
Reported-by: Adam Lackorzynski <address@hidden>
Signed-off-by: Julien Grall <address@hidden>
Tested-by: Adam Lackorzynski <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/pc.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/hw/pc.c b/hw/pc.c
index df0c48e..90b1bf7 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -103,6 +103,11 @@ static void ioport80_write(void *opaque, hwaddr addr,
uint64_t data,
{
}
+static uint64_t ioport80_read(void *opaque, hwaddr addr, unsigned size)
+{
+ return 0xffffffffffffffff;
+}
+
/* MSDOS compatibility mode FPU exception support */
static qemu_irq ferr_irq;
@@ -123,6 +128,11 @@ static void ioportF0_write(void *opaque, hwaddr addr,
uint64_t data,
qemu_irq_lower(ferr_irq);
}
+static uint64_t ioportF0_read(void *opaque, hwaddr addr, unsigned size)
+{
+ return 0xffffffffffffffff;
+}
+
/* TSC handling */
uint64_t cpu_get_tsc(CPUX86State *env)
{
@@ -960,6 +970,7 @@ static void cpu_request_exit(void *opaque, int irq, int
level)
static const MemoryRegionOps ioport80_io_ops = {
.write = ioport80_write,
+ .read = ioport80_read,
.endianness = DEVICE_NATIVE_ENDIAN,
.impl = {
.min_access_size = 1,
@@ -969,6 +980,7 @@ static const MemoryRegionOps ioport80_io_ops = {
static const MemoryRegionOps ioportF0_io_ops = {
.write = ioportF0_write,
+ .read = ioportF0_read,
.endianness = DEVICE_NATIVE_ENDIAN,
.impl = {
.min_access_size = 1,
--
1.8.0.2
- [Qemu-devel] [PULL 0/6] Trivial patches for 5 to 11 January 2013, Stefan Hajnoczi, 2013/01/11
- [Qemu-devel] [PATCH 2/6] configure: Fix comment (copy+paste bug), Stefan Hajnoczi, 2013/01/11
- [Qemu-devel] [PATCH 3/6] qga/channel-posix.c: Explicitly include string.h, Stefan Hajnoczi, 2013/01/11
- [Qemu-devel] [PATCH 1/6] readline: avoid memcpy() of overlapping regions, Stefan Hajnoczi, 2013/01/11
- [Qemu-devel] [PATCH 5/6] Replace remaining gmtime, localtime by gmtime_r, localtime_r, Stefan Hajnoczi, 2013/01/11
- [Qemu-devel] [PATCH 4/6] savevm: Remove MinGW specific code which is no longer needed, Stefan Hajnoczi, 2013/01/11
- [Qemu-devel] [PATCH 6/6] hw/pc.c: Fix converting of ioport_register* to MemoryRegion,
Stefan Hajnoczi <=
- Re: [Qemu-devel] [PATCH 6/6] hw/pc.c: Fix converting of ioport_register* to MemoryRegion, Julien Grall, 2013/01/11
- Re: [Qemu-devel] [PULL 0/6] Trivial patches for 5 to 11 January 2013, Anthony Liguori, 2013/01/11