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>
131 lines
4.2 KiB
C
131 lines
4.2 KiB
C
/*
|
|
* TriCore Baseboard System emulation.
|
|
*
|
|
* Copyright (c) 2013-2014 Bastian Koppelmann C-Lab/University Paderborn
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
|
|
#include "hw/hw.h"
|
|
#include "hw/devices.h"
|
|
#include "net/net.h"
|
|
#include "sysemu/sysemu.h"
|
|
#include "hw/boards.h"
|
|
#include "hw/loader.h"
|
|
#include "sysemu/block-backend.h"
|
|
#include "exec/address-spaces.h"
|
|
#include "hw/block/flash.h"
|
|
#include "elf.h"
|
|
#include "hw/tricore/tricore.h"
|
|
#include "qemu/error-report.h"
|
|
|
|
|
|
/* Board init. */
|
|
|
|
static struct tricore_boot_info tricoretb_binfo;
|
|
|
|
static void tricore_load_kernel(CPUTriCoreState *env)
|
|
{
|
|
uint64_t entry;
|
|
long kernel_size;
|
|
|
|
kernel_size = load_elf(tricoretb_binfo.kernel_filename, NULL,
|
|
NULL, (uint64_t *)&entry, NULL,
|
|
NULL, 0,
|
|
ELF_MACHINE, 1);
|
|
if (kernel_size <= 0) {
|
|
error_report("qemu: no kernel file '%s'",
|
|
tricoretb_binfo.kernel_filename);
|
|
exit(1);
|
|
}
|
|
env->PC = entry;
|
|
|
|
}
|
|
|
|
static void tricore_testboard_init(MachineState *machine, int board_id)
|
|
{
|
|
TriCoreCPU *cpu;
|
|
CPUTriCoreState *env;
|
|
|
|
MemoryRegion *sysmem = get_system_memory();
|
|
MemoryRegion *ext_cram = g_new(MemoryRegion, 1);
|
|
MemoryRegion *ext_dram = g_new(MemoryRegion, 1);
|
|
MemoryRegion *int_cram = g_new(MemoryRegion, 1);
|
|
MemoryRegion *int_dram = g_new(MemoryRegion, 1);
|
|
MemoryRegion *pcp_data = g_new(MemoryRegion, 1);
|
|
MemoryRegion *pcp_text = g_new(MemoryRegion, 1);
|
|
|
|
if (!machine->cpu_model) {
|
|
machine->cpu_model = "tc1796";
|
|
}
|
|
cpu = cpu_tricore_init(machine->cpu_model);
|
|
if (!cpu) {
|
|
error_report("Unable to find CPU definition");
|
|
exit(1);
|
|
}
|
|
env = &cpu->env;
|
|
memory_region_init_ram(ext_cram, NULL, "powerlink_ext_c.ram", 2*1024*1024,
|
|
&error_fatal);
|
|
vmstate_register_ram_global(ext_cram);
|
|
memory_region_init_ram(ext_dram, NULL, "powerlink_ext_d.ram", 4*1024*1024,
|
|
&error_fatal);
|
|
vmstate_register_ram_global(ext_dram);
|
|
memory_region_init_ram(int_cram, NULL, "powerlink_int_c.ram", 48*1024,
|
|
&error_fatal);
|
|
vmstate_register_ram_global(int_cram);
|
|
memory_region_init_ram(int_dram, NULL, "powerlink_int_d.ram", 48*1024,
|
|
&error_fatal);
|
|
vmstate_register_ram_global(int_dram);
|
|
memory_region_init_ram(pcp_data, NULL, "powerlink_pcp_data.ram", 16*1024,
|
|
&error_fatal);
|
|
vmstate_register_ram_global(pcp_data);
|
|
memory_region_init_ram(pcp_text, NULL, "powerlink_pcp_text.ram", 32*1024,
|
|
&error_fatal);
|
|
vmstate_register_ram_global(pcp_text);
|
|
|
|
memory_region_add_subregion(sysmem, 0x80000000, ext_cram);
|
|
memory_region_add_subregion(sysmem, 0xa1000000, ext_dram);
|
|
memory_region_add_subregion(sysmem, 0xd4000000, int_cram);
|
|
memory_region_add_subregion(sysmem, 0xd0000000, int_dram);
|
|
memory_region_add_subregion(sysmem, 0xf0050000, pcp_data);
|
|
memory_region_add_subregion(sysmem, 0xf0060000, pcp_text);
|
|
|
|
tricoretb_binfo.ram_size = machine->ram_size;
|
|
tricoretb_binfo.kernel_filename = machine->kernel_filename;
|
|
|
|
if (machine->kernel_filename) {
|
|
tricore_load_kernel(env);
|
|
}
|
|
}
|
|
|
|
static void tricoreboard_init(MachineState *machine)
|
|
{
|
|
tricore_testboard_init(machine, 0x183);
|
|
}
|
|
|
|
static QEMUMachine ttb_machine = {
|
|
.name = "tricore_testboard",
|
|
.desc = "a minimal TriCore board",
|
|
.init = tricoreboard_init,
|
|
.is_default = 0,
|
|
};
|
|
|
|
static void tricore_testboard_machine_init(void)
|
|
{
|
|
qemu_register_machine(&ttb_machine);
|
|
}
|
|
|
|
machine_init(tricore_testboard_machine_init);
|