Commit 2ddb89b0 authored by Singh, Brijesh's avatar Singh, Brijesh Committed by Paolo Bonzini
Browse files

memory: Fix the memory region type assignment order 

Currently, a callback registered through the RAMBlock notifier
is not able to get the memory region type (i.e callback is not
able to use memory_region_is_ram_device function). This is
because mr->ram assignment happens _after_ the memory is allocated
whereas the callback is executed during allocation.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1667249


Suggested-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarBrijesh Singh <brijesh.singh@amd.com>
Message-Id: <20190204222322.26766-2-brijesh.singh@amd.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d6c1bd4a

memory.c

+8 −1
Original line number Diff line number Diff line
@@ -1649,10 +1649,17 @@ void memory_region_init_ram_device_ptr(MemoryRegion *mr, 
                                       uint64_t size,

                                       void *ptr)

{

    memory_region_init_ram_ptr(mr, owner, name, size, ptr);

    memory_region_init(mr, owner, name, size);

    mr->ram = true;

    mr->terminates = true;

    mr->ram_device = true;

    mr->ops = &ram_device_mem_ops;

    mr->opaque = mr;

    mr->destructor = memory_region_destructor_ram;

    mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0;

    /* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL.  */

    assert(ptr != NULL);

    mr->ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_fatal);

}



void memory_region_init_alias(MemoryRegion *mr,