Commit df8abec8 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

loader: Fix memory_region_init_resizeable_ram() error handling 



Commit ef701d7b 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 39228250 "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 a1666142, so Coccinelle missed it.  Fix it up.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <1441983105-26376-4-git-send-email-armbru@redhat.com>
Reviewed-by: default avatarPeter Crosthwaite <crosthwaite.peter@gmail.com>
parent f8ed85ac

hw/core/loader.c

+1 −1
Original line number Diff line number Diff line
@@ -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);