From c3d30392ea7f29823de3b4514ce3b75d7254ee58 Mon Sep 17 00:00:00 2001 From: Gary R Hook Date: Wed, 10 Apr 2019 00:08:02 +0100 Subject: [PATCH 2/5] memory: Fix the memory region type assignment order RH-Author: Gary R Hook Message-id: <20190410000803.1744-2-ghook@redhat.com> Patchwork-id: 85543 O-Subject: [RHEL-8.1 virt 1/2] memory: Fix the memory region type assignment order Bugzilla: 1667249 RH-Acked-by: Eduardo Habkost RH-Acked-by: Paolo Bonzini RH-Acked-by: Alex Williamson BZ: 1667249 Branch: rhel-8.1.0 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1667249 Upstream Status: 4.0.0-rc1 Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=20980582 Conflicts: None commit 2ddb89b00f947f785c9ca6742f28f954e3b75e62 Author: Singh, Brijesh Date: Mon Feb 4 22:23:39 2019 +0000 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: Alex Williamson Cc: Paolo Bonzini Reviewed-by: Alex Williamson Signed-off-by: Brijesh Singh Message-Id: <20190204222322.26766-2-brijesh.singh@amd.com> Signed-off-by: Paolo Bonzini Cc: Paolo Bonzini Cc: qemu-devel@nongnu.org Signed-off-by: Danilo C. L. de Paula --- memory.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/memory.c b/memory.c index 4974f97..04ff5e9 100644 --- a/memory.c +++ b/memory.c @@ -1631,10 +1631,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, -- 1.8.3.1