[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 098/103] numa: handle mmaped memory allocation failur
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 098/103] numa: handle mmaped memory allocation failure correctly |
Date: |
Tue, 17 Jun 2014 20:42:20 +0300 |
From: Igor Mammedov <address@hidden>
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 <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
numa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/numa.c b/numa.c
index eef0717..e471afe 100644
--- a/numa.c
+++ b/numa.c
@@ -238,7 +238,7 @@ static void allocate_system_memory_nonnuma(MemoryRegion
*mr, Object *owner,
/* Legacy behavior: if allocation failed, fall back to
* regular RAM allocation.
*/
- if (!memory_region_size(mr)) {
+ if (err) {
qerror_report_err(err);
error_free(err);
memory_region_init_ram(mr, owner, name, ram_size);
--
MST
- [Qemu-devel] [PULL 094/103] qdev: reorganize error reporting in bus_set_realized, (continued)
- [Qemu-devel] [PULL 094/103] qdev: reorganize error reporting in bus_set_realized, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 095/103] qdev: recursively unrealize devices when unrealizing bus, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 096/103] qmp: clean out whitespace, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 048/103] Add G_IO_HUP handler for socket chardev, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 063/103] NUMA: check if the total numa memory size is equal to ram_size, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 064/103] NUMA: Add numa_info structure to contain numa nodes info, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 099/103] qmp: add query-memory-devices command, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 100/103] acpi: introduce TYPE_ACPI_DEVICE_IF interface, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 062/103] NUMA: move numa related code to new file numa.c, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 097/103] pc: acpi: do not hardcode preprocessor, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 098/103] numa: handle mmaped memory allocation failure correctly,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 102/103] qmp: add query-acpi-ospm-status command, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 036/103] virtio: Drop superfluous conditionals around g_free(), Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 088/103] qmp: add query-memdev, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 034/103] acpi: update generated files, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 060/103] libqemustub: add stubs to be able to use qemu-char.c, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 068/103] qmp: improve error reporting for -object and object-add, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 035/103] acpi-test: update expected tables, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 086/103] hostmem: add property to map memory with MAP_SHARED, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 046/103] Add chardev API qemu_chr_fe_set_msgfds, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 087/103] hostmem: add properties for NUMA memory policy, Michael S. Tsirkin, 2014/06/17