diff options
| author | Anthony Liguori | 2011-09-01 20:55:58 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2011-09-01 20:55:58 +0200 |
| commit | a952c570c865d5eae6c148716f2cb585a0d3a2ee (patch) | |
| tree | ea00e6e5d9622182441726d7e9841275cc67221e /memory.c | |
| parent | build: sort objects to remove duplicates for link (diff) | |
| parent | memory: Fix memory_region_get_ram_ptr for ROM devices (diff) | |
| download | qemu-a952c570c865d5eae6c148716f2cb585a0d3a2ee.tar.gz qemu-a952c570c865d5eae6c148716f2cb585a0d3a2ee.tar.xz qemu-a952c570c865d5eae6c148716f2cb585a0d3a2ee.zip | |
Merge remote-tracking branch 'qemu-kvm-tmp/memory/core' into staging
Diffstat (limited to 'memory.c')
| -rw-r--r-- | memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1063,7 +1063,7 @@ void *memory_region_get_ram_ptr(MemoryRegion *mr) assert(mr->terminates); - return qemu_get_ram_ptr(mr->ram_addr); + return qemu_get_ram_ptr(mr->ram_addr & TARGET_PAGE_MASK); } static void memory_region_update_coalesced_range(MemoryRegion *mr) |