45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
|
From: "Singh, Brijesh" <brijesh.singh@amd.com>
|
||
|
|
Date: Fri, 15 Feb 2019 14:22:21 -0700
|
||
|
|
Subject: 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 <alex.williamson@redhat.com>
|
||
|
|
Cc: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
|
||
|
|
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
|
||
|
|
[BSC#1123205]
|
||
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||
|
|
---
|
||
|
|
memory.c | 9 ++++++++-
|
||
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/memory.c b/memory.c
|
||
|
|
index d14c6dec1d..d1b68fdae8 100644
|
||
|
|
--- a/memory.c
|
||
|
|
+++ b/memory.c
|
||
|
|
@@ -1605,10 +1605,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,
|