From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:45574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5Gqo-0000tN-C1 for qemu-devel@nongnu.org; Sun, 18 Sep 2011 08:52:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R5Gqm-0007hh-Qs for qemu-devel@nongnu.org; Sun, 18 Sep 2011 08:52:02 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:42339) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5Gqm-0007hb-JP for qemu-devel@nongnu.org; Sun, 18 Sep 2011 08:52:00 -0400 Message-ID: <4E75E96E.90101@web.de> Date: Sun, 18 Sep 2011 14:51:58 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <4E75E7A4.50702@web.de> In-Reply-To: <4E75E7A4.50702@web.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH v2 1/2] memory: Fix old portio word accesses List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity Cc: qemu-devel , Richard Henderson From: Jan Kiszka As we register old portio regions via ioport_register, we are also responsible for providing the word access wrapper. Signed-off-by: Jan Kiszka --- Oops, was lacking a shift for word reads. memory.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/memory.c b/memory.c index b3ee232..aef4702 100644 --- a/memory.c +++ b/memory.c @@ -397,6 +397,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; } @@ -419,6 +424,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; } -- 1.7.3.4