From 54b97017994836a0ff28d217dca4e0d1930db272 Mon Sep 17 00:00:00 2001 From: "Singh, Brijesh" Date: Fri, 29 Mar 2019 19:26:49 -0400 Subject: [PATCH] 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 Backports commit 2ddb89b00f947f785c9ca6742f28f954e3b75e62 from qemu --- qemu/memory.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/qemu/memory.c b/qemu/memory.c index 2abf015a..eafcb580 100644 --- a/qemu/memory.c +++ b/qemu/memory.c @@ -1465,10 +1465,17 @@ void memory_region_init_ram_device_ptr(struct uc_struct *uc, uint64_t size, void *ptr) { - memory_region_init_ram_ptr(uc, mr, owner, name, size, ptr); + memory_region_init(uc, 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(uc) ? (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(struct uc_struct *uc, MemoryRegion *mr,