From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrHHO-0004kX-PB for qemu-devel@nongnu.org; Wed, 10 Aug 2011 18:29:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QrHHN-0006QK-R0 for qemu-devel@nongnu.org; Wed, 10 Aug 2011 18:29:38 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:54887) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrHHN-0006La-Mj for qemu-devel@nongnu.org; Wed, 10 Aug 2011 18:29:37 -0400 Received: by mail-ww0-f53.google.com with SMTP id 25so1339901wwf.10 for ; Wed, 10 Aug 2011 15:29:37 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Wed, 10 Aug 2011 15:28:19 -0700 Message-Id: <1313015300-23920-11-git-send-email-rth@twiddle.net> In-Reply-To: <1313015300-23920-1-git-send-email-rth@twiddle.net> References: <1313015300-23920-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 10/11] memory: Fix old_portio vs non-zero offset. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: avi@redhat.com The legacy functions that we're wrapping expect that offset to be included in the register. Indeed, they generally expect the absolute address and then mask off the "high" bits. The FDC is the first converted device with a non-zero offset. Signed-off-by: Richard Henderson --- memory.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/memory.c b/memory.c index a1f118b..2c82cd3 100644 --- a/memory.c +++ b/memory.c @@ -367,7 +367,7 @@ static void memory_region_iorange_read(IORange *iorange, *data = ((uint64_t)1 << (width * 8)) - 1; if (mrp) { - *data = mrp->read(mr->opaque, offset - mrp->offset); + *data = mrp->read(mr->opaque, offset); } return; } @@ -391,7 +391,7 @@ static void memory_region_iorange_write(IORange *iorange, const MemoryRegionPortio *mrp = find_portio(mr, offset, width, true); if (mrp) { - mrp->write(mr->opaque, offset - mrp->offset, data); + mrp->write(mr->opaque, offset, data); } return; } -- 1.7.6