diff options
| author | Philippe Mathieu-Daudé | 2020-10-19 11:51:48 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-10-20 17:12:01 +0200 |
| commit | b3267ff675dd410b4c2a569e209cb7d468cf1873 (patch) | |
| tree | 3ca3bdcfcaa95660e6540545958aba3f2db6e72e /hw/arm | |
| parent | microbit_i2c: Fix coredump when dump-vmstate (diff) | |
| download | qemu-b3267ff675dd410b4c2a569e209cb7d468cf1873.tar.gz qemu-b3267ff675dd410b4c2a569e209cb7d468cf1873.tar.xz qemu-b3267ff675dd410b4c2a569e209cb7d468cf1873.zip | |
hw/arm/nseries: Fix loading kernel image on n8x0 machines
Commit 7998beb9c2e removed the ram_size initialization in the
arm_boot_info structure, however it is used by arm_load_kernel().
Initialize the field to fix:
$ qemu-system-arm -M n800 -append 'console=ttyS1' \
-kernel meego-arm-n8x0-1.0.80.20100712.1431-vmlinuz-2.6.35~rc4-129.1-n8x0
qemu-system-arm: kernel 'meego-arm-n8x0-1.0.80.20100712.1431-vmlinuz-2.6.35~rc4-129.1-n8x0' is too large to fit in RAM (kernel size 1964608, RAM size 0)
Noticed while running the test introduced in commit 050a82f0c5b
("tests/acceptance: Add a test for the N800 and N810 arm machines").
Fixes: 7998beb9c2e ("arm/nseries: use memdev for RAM")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Thomas Huth <thuth@redhat.com>
Message-id: 20201019095148.1602119-1-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm')
| -rw-r--r-- | hw/arm/nseries.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index e48092ca04..76fd7fe985 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -1318,6 +1318,7 @@ static void n8x0_init(MachineState *machine, g_free(sz); exit(EXIT_FAILURE); } + binfo->ram_size = machine->ram_size; memory_region_add_subregion(get_system_memory(), OMAP2_Q2_BASE, machine->ram); |