| Message ID | 20231120133112.82447-1-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | system: Use &error_abort in memory_region_init_ram_[device_]ptr() | expand |
On 20.11.23 14:31, Philippe Mathieu-Daudé wrote: > If an unexpected error condition happens, we have to abort > (&fatal_error is meant for expected errors). > > Suggested-by: Paolo Bonzini <pbonzini@redhat.com> > Suggested-by: Markus Armbruster <armbru@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > system/memory.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/system/memory.c b/system/memory.c > index 304fa843ea..4d9cb0a7ff 100644 > --- a/system/memory.c > +++ b/system/memory.c > @@ -1692,7 +1692,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, > > /* 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); > + mr->ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); > } > > void memory_region_init_ram_device_ptr(MemoryRegion *mr, > @@ -1711,7 +1711,7 @@ void memory_region_init_ram_device_ptr(MemoryRegion *mr, > > /* 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); > + mr->ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); > } > > void memory_region_init_alias(MemoryRegion *mr, Reviewed-by: David Hildenbrand <david@redhat.com>
Philippe Mathieu-Daudé <philmd@linaro.org> writes: > If an unexpected error condition happens, we have to abort > (&fatal_error is meant for expected errors). > > Suggested-by: Paolo Bonzini <pbonzini@redhat.com> > Suggested-by: Markus Armbruster <armbru@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Markus Armbruster <armbru@redhat.com>
Queued, thanks. Paolo
diff --git a/system/memory.c b/system/memory.c index 304fa843ea..4d9cb0a7ff 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1692,7 +1692,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, /* 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); + mr->ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); } void memory_region_init_ram_device_ptr(MemoryRegion *mr, @@ -1711,7 +1711,7 @@ void memory_region_init_ram_device_ptr(MemoryRegion *mr, /* 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); + mr->ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort); } void memory_region_init_alias(MemoryRegion *mr,
If an unexpected error condition happens, we have to abort (&fatal_error is meant for expected errors). Suggested-by: Paolo Bonzini <pbonzini@redhat.com> Suggested-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- system/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)