aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-08-22 12:26:30 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-08-22 12:26:30 -0500
commit6e23063c469c0d90d14b376a696d87149e2a1aa4 (patch)
treea6e45a34bef10d8c3abf3dec0f8ca2735b469721
parent22a78d64cca77916e0b56f63b493ff5e445c41b9 (diff)
parent563ea489031375c53d3b94d74c56c42238e94914 (diff)
Merge remote-tracking branch 'qemu-kvm/memory/core' into staging
-rw-r--r--memory.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/memory.c b/memory.c
index 531b57533a..8e9ac460e8 100644
--- a/memory.c
+++ b/memory.c
@@ -396,7 +396,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;
}
@@ -418,7 +418,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;
}