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

This commit is contained in:
Anthony Liguori 2011-09-01 13:55:58 -05:00
commit a952c570c8
1 changed files with 1 additions and 1 deletions

View File

@ -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)