yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-04-17 14:41:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

memory: Fix the memory region type assignment order

Browse source 
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
This commit is contained in:
Singh, Brijesh 2019-03-29 19:26:49 -04:00 committed by Lioncash
parent d57c77afcf
commit 54b9701799
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
qemu/memory.c
View file

@ -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,