From: Jan Kiszka Date: Sun, 18 Sep 2011 12:51:58 +0000 (+0200) Subject: memory: Fix old portio word accesses X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=03808f58e4399a7e1c85bd4ea535fafdf592246c;p=qemu.git memory: Fix old portio word accesses As we register old portio regions via ioport_register, we are also responsible for providing the word access wrapper. Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity --- diff --git a/memory.c b/memory.c index 27abd3e8fe..dc5e35d667 100644 --- a/memory.c +++ b/memory.c @@ -404,6 +404,11 @@ static void memory_region_iorange_read(IORange *iorange, *data = ((uint64_t)1 << (width * 8)) - 1; if (mrp) { *data = mrp->read(mr->opaque, offset + mr->offset); + } else if (width == 2) { + mrp = find_portio(mr, offset, 1, false); + assert(mrp); + *data = mrp->read(mr->opaque, offset + mr->offset) | + (mrp->read(mr->opaque, offset + mr->offset + 1) << 8); } return; } @@ -426,6 +431,11 @@ static void memory_region_iorange_write(IORange *iorange, if (mrp) { mrp->write(mr->opaque, offset + mr->offset, data); + } else if (width == 2) { + mrp = find_portio(mr, offset, 1, false); + assert(mrp); + mrp->write(mr->opaque, offset + mr->offset, data & 0xff); + mrp->write(mr->opaque, offset + mr->offset + 1, data >> 8); } return; }