Commit a952c570 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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

parents e2a99ad3 021d26d1

memory.c

+1 −1
Original line number Diff line number Diff line
@@ -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)