commit 6e23063c469c0d90d14b376a696d87149e2a1aa4
author Anthony Liguori <aliguori@us.ibm.com> Mon Aug 22 12:26:30 2011 -0500
committer Anthony Liguori <aliguori@us.ibm.com> Mon Aug 22 12:26:30 2011 -0500
tree a6e45a34bef10d8c3abf3dec0f8ca2735b469721
parent 22a78d64cca77916e0b56f63b493ff5e445c41b9
parent 563ea489031375c53d3b94d74c56c42238e94914

Merge remote-tracking branch 'qemu-kvm/memory/core' into staging

memory.c

diff --git a/memory.c b/memory.c
index 531b575..8e9ac46 100644
--- a/memory.c
+++ b/memory.c
@@ -396,7 +396,7 @@
 
         *data = ((uint64_t)1 << (width * 8)) - 1;
         if (mrp) {
-            *data = mrp->read(mr->opaque, offset - mrp->offset);
+            *data = mrp->read(mr->opaque, offset);
         }
         return;
     }
@@ -418,7 +418,7 @@
         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;
     }