f8ed85ac99
Symptom:
$ qemu-system-x86_64 -m 10000000
Unexpected error in ram_block_add() at /work/armbru/qemu/exec.c:1456:
upstream-qemu: cannot set up guest memory 'pc.ram': Cannot allocate memory
Aborted (core dumped)
Root cause: commit ef701d7 screwed up handling of out-of-memory
conditions. Before the commit, we report the error and exit(1), in
one place, ram_block_add(). 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 three places are:
* memory_region_init_ram()
Commit 4994653 (right after commit ef701d7) lifted the error
handling further, through memory_region_init_ram(), multiplying the
incorrect use of &error_abort. Later on, imitation of existing
(bad) code may have created more.
* memory_region_init_ram_ptr()
The &error_abort is still there.
* memory_region_init_rom_device()
Doesn't need fixing, because commit 33e0eb5 (soon after commit
ef701d7) lifted the error handling further, and in the process
changed it from &error_abort to passing it up the call chain.
Correct, because the callers are realize() methods.
Fix the error handling after memory_region_init_ram() with a
Coccinelle semantic patch:
@r@
expression mr, owner, name, size, err;
position p;
@@
memory_region_init_ram(mr, owner, name, size,
(
- &error_abort
+ &error_fatal
|
err@p
)
);
@script:python@
p << r.p;
@@
print "%s:%s:%s" % (p[0].file, p[0].line, p[0].column)
When the last argument is &error_abort, it gets replaced by
&error_fatal. This is the fix.
If the last argument is anything else, its position is reported. This
lets us check the fix is complete. Four positions get reported:
* ram_backend_memory_alloc()
Error is passed up the call chain, ultimately through
user_creatable_complete(). As far as I can tell, it's callers all
handle the error sanely.
* fsl_imx25_realize(), fsl_imx31_realize(), dp8393x_realize()
DeviceClass.realize() methods, errors handled sanely further up the
call chain.
We're good. Test case again behaves:
$ qemu-system-x86_64 -m 10000000
qemu-system-x86_64: cannot set up guest memory 'pc.ram': Cannot allocate memory
[Exit 1 ]
The next commits will repair the rest of commit ef701d7's damage.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1441983105-26376-3-git-send-email-armbru@redhat.com>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
103 lines
3.4 KiB
C
103 lines
3.4 KiB
C
/*
|
|
* SHIX 2.0 board description
|
|
*
|
|
* Copyright (c) 2005 Samuel Tardieu
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
/*
|
|
Shix 2.0 board by Alexis Polti, described at
|
|
http://perso.enst.fr/~polti/realisations/shix20/
|
|
|
|
More information in target-sh4/README.sh4
|
|
*/
|
|
#include "hw/hw.h"
|
|
#include "hw/sh4/sh.h"
|
|
#include "sysemu/sysemu.h"
|
|
#include "sysemu/qtest.h"
|
|
#include "hw/boards.h"
|
|
#include "hw/loader.h"
|
|
#include "exec/address-spaces.h"
|
|
#include "qemu/error-report.h"
|
|
|
|
#define BIOS_FILENAME "shix_bios.bin"
|
|
#define BIOS_ADDRESS 0xA0000000
|
|
|
|
static void shix_init(MachineState *machine)
|
|
{
|
|
const char *cpu_model = machine->cpu_model;
|
|
int ret;
|
|
SuperHCPU *cpu;
|
|
struct SH7750State *s;
|
|
MemoryRegion *sysmem = get_system_memory();
|
|
MemoryRegion *rom = g_new(MemoryRegion, 1);
|
|
MemoryRegion *sdram = g_new(MemoryRegion, 2);
|
|
|
|
if (!cpu_model)
|
|
cpu_model = "any";
|
|
|
|
cpu = cpu_sh4_init(cpu_model);
|
|
if (cpu == NULL) {
|
|
fprintf(stderr, "Unable to find CPU definition\n");
|
|
exit(1);
|
|
}
|
|
|
|
/* Allocate memory space */
|
|
memory_region_init_ram(rom, NULL, "shix.rom", 0x4000, &error_fatal);
|
|
vmstate_register_ram_global(rom);
|
|
memory_region_set_readonly(rom, true);
|
|
memory_region_add_subregion(sysmem, 0x00000000, rom);
|
|
memory_region_init_ram(&sdram[0], NULL, "shix.sdram1", 0x01000000,
|
|
&error_fatal);
|
|
vmstate_register_ram_global(&sdram[0]);
|
|
memory_region_add_subregion(sysmem, 0x08000000, &sdram[0]);
|
|
memory_region_init_ram(&sdram[1], NULL, "shix.sdram2", 0x01000000,
|
|
&error_fatal);
|
|
vmstate_register_ram_global(&sdram[1]);
|
|
memory_region_add_subregion(sysmem, 0x0c000000, &sdram[1]);
|
|
|
|
/* Load BIOS in 0 (and access it through P2, 0xA0000000) */
|
|
if (bios_name == NULL)
|
|
bios_name = BIOS_FILENAME;
|
|
ret = load_image_targphys(bios_name, 0, 0x4000);
|
|
if (ret < 0 && !qtest_enabled()) {
|
|
error_report("Could not load SHIX bios '%s'", bios_name);
|
|
exit(1);
|
|
}
|
|
|
|
/* Register peripherals */
|
|
s = sh7750_init(cpu, sysmem);
|
|
/* XXXXX Check success */
|
|
tc58128_init(s, "shix_linux_nand.bin", NULL);
|
|
}
|
|
|
|
static QEMUMachine shix_machine = {
|
|
.name = "shix",
|
|
.desc = "shix card",
|
|
.init = shix_init,
|
|
.is_default = 1,
|
|
};
|
|
|
|
static void shix_machine_init(void)
|
|
{
|
|
qemu_register_machine(&shix_machine);
|
|
}
|
|
|
|
machine_init(shix_machine_init);
|