diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-09-11 16:51:44 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-09-18 14:39:35 +0200 |
| commit | df8abec8cb48f6c439516fd78b3ab6535e6fd493 (patch) | |
| tree | 8c6e04818d0070d45142c6ed59a7a4d221b482ee | |
| parent | f8ed85ac992c48814d916d5df4d44f9a971c5de4 (diff) | |
| download | qemu-df8abec8cb48f6c439516fd78b3ab6535e6fd493.tar.gz | |
loader: Fix memory_region_init_resizeable_ram() error handling
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 <armbru@redhat.com>
Message-Id: <1441983105-26376-4-git-send-email-armbru@redhat.com>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
| -rw-r--r-- | hw/core/loader.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/core/loader.c b/hw/core/loader.c index a96a74e579..eb67f05ee2 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); |