david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

numa: handle mmaped memory allocation failure correctly

Browse Source 
when memory_region_init_ram_from_file() fails
memory_region_size() will still return size that was
provided at region init time.
Instead use errp to properly detect error condition.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Igor Mammedov 2014-06-17 12:17:05 +02:00 committed by Michael S. Tsirkin
parent dc61b29531
commit c3ba309507
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
numa.c
View File

@ -238,7 +238,7 @@ static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner,
/* Legacy behavior: if allocation failed, fall back to /* Legacy behavior: if allocation failed, fall back to
* regular RAM allocation. * regular RAM allocation.
*/ */
if (!memory_region_size(mr)) { if (err) {
qerror_report_err(err); qerror_report_err(err);
error_free(err); error_free(err);
memory_region_init_ram(mr, owner, name, ram_size); memory_region_init_ram(mr, owner, name, ram_size);