| Message ID | 20190117215300.29694-2-brijesh.singh@amd.com |
|---|---|
| State | New |
| Headers | show |
| Series | Fix SEV VM device assignment | expand |
On Thu, 17 Jan 2019 21:53:16 +0000 "Singh, Brijesh" <brijesh.singh@amd.com> wrote: > 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 > Sugegsted-by: Alex Williamson <alex.williamson@redhat.com> s/Sugegsted/Suggested/ > Cc: Paolo Bonzini <pbonzini@redhat.com> > Signed-off-by: Brijesh Singh <brijesh.singh@amd.com> > --- > memory.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/memory.c b/memory.c > index 61d66e4441..9ec15349dd 100644 > --- a/memory.c > +++ b/memory.c > @@ -1652,10 +1652,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, Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
diff --git a/memory.c b/memory.c index 61d66e4441..9ec15349dd 100644 --- a/memory.c +++ b/memory.c @@ -1652,10 +1652,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,
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 Sugegsted-by: Alex Williamson <alex.williamson@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Brijesh Singh <brijesh.singh@amd.com> --- memory.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)