[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/8] loader: Fix memory_region_init_resizeable_ram()
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 7/8] loader: Fix memory_region_init_resizeable_ram() error handling |
Date: |
Fri, 18 Sep 2015 15:22:53 +0200 |
Commit ef701d7 screwed up handling of out-of-memory conditions.
Before the commit, we report the error and exit(1), in one place. The
commit lifts the error handling up the call chain some, to three
places. Fine. Except it uses &error_abort in these places, changing
the behavior from exit(1) to abort(), and thus undoing the work of
commit 3922825 "exec: Don't abort when we can't allocate guest
memory".
The previous commit fixed up uses of memory_region_init_ram(). One of
them was replaced by memory_region_init_resizeable_ram() [sic!] in
commit a166614, so Coccinelle missed it. Fix it up.
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
---
hw/core/loader.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/core/loader.c b/hw/core/loader.c
index a96a74e..eb67f05 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -740,7 +740,7 @@ static void *rom_set_mr(Rom *rom, Object *owner, const char
*name)
memory_region_init_resizeable_ram(rom->mr, owner, name,
rom->datasize, rom->romsize,
fw_cfg_resized,
- &error_abort);
+ &error_fatal);
memory_region_set_readonly(rom->mr, true);
vmstate_register_ram_global(rom->mr);
--
2.4.3
- [Qemu-devel] [PULL 0/8] Error reporting patches, Markus Armbruster, 2015/09/18
- [Qemu-devel] [PULL 5/8] error: New error_fatal, Markus Armbruster, 2015/09/18
- [Qemu-devel] [PULL 8/8] memory: Fix bad error handling in memory_region_init_ram_ptr(), Markus Armbruster, 2015/09/18
- [Qemu-devel] [PULL 6/8] Fix bad error handling after memory_region_init_ram(), Markus Armbruster, 2015/09/18
- Re: [Qemu-devel] [PULL 0/8] Error reporting patches, Peter Maydell, 2015/09/18