* [PATCH] hw/arm/nseries: Fix loading kernel image on n8x0 machines
@ 2020-10-19 9:51 Philippe Mathieu-Daudé
2020-10-19 14:51 ` Richard Henderson
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-10-19 9:51 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Andrew Jones, Richard Henderson, Thomas Huth,
Philippe Mathieu-Daudé, qemu-arm, Igor Mammedov
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>
---
hw/arm/nseries.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index e48092ca047..76fd7fe9854 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);
--
2.26.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] hw/arm/nseries: Fix loading kernel image on n8x0 machines
2020-10-19 9:51 [PATCH] hw/arm/nseries: Fix loading kernel image on n8x0 machines Philippe Mathieu-Daudé
@ 2020-10-19 14:51 ` Richard Henderson
2020-10-19 16:12 ` Thomas Huth
2020-10-20 14:37 ` Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Richard Henderson @ 2020-10-19 14:51 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Peter Maydell, Andrew Jones, Thomas Huth, qemu-arm, Igor Mammedov
On 10/19/20 2:51 AM, Philippe Mathieu-Daudé wrote:
> 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>
> ---
> hw/arm/nseries.c | 1 +
> 1 file changed, 1 insertion(+)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] hw/arm/nseries: Fix loading kernel image on n8x0 machines
2020-10-19 9:51 [PATCH] hw/arm/nseries: Fix loading kernel image on n8x0 machines Philippe Mathieu-Daudé
2020-10-19 14:51 ` Richard Henderson
@ 2020-10-19 16:12 ` Thomas Huth
2020-10-20 14:37 ` Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Huth @ 2020-10-19 16:12 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Peter Maydell, Andrew Jones, qemu-arm, Richard Henderson,
Igor Mammedov
On 19/10/2020 11.51, Philippe Mathieu-Daudé wrote:
> 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>
> ---
> hw/arm/nseries.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
> index e48092ca047..76fd7fe9854 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);
>
Fixes the test in "make check-acceptance" for me:
Tested-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] hw/arm/nseries: Fix loading kernel image on n8x0 machines
2020-10-19 9:51 [PATCH] hw/arm/nseries: Fix loading kernel image on n8x0 machines Philippe Mathieu-Daudé
2020-10-19 14:51 ` Richard Henderson
2020-10-19 16:12 ` Thomas Huth
@ 2020-10-20 14:37 ` Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2020-10-20 14:37 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Thomas Huth, Richard Henderson, Andrew Jones, QEMU Developers,
qemu-arm, Igor Mammedov
On Mon, 19 Oct 2020 at 10:51, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> 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>
Applied to target-arm.next, thanks.
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-20 14:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-19 9:51 [PATCH] hw/arm/nseries: Fix loading kernel image on n8x0 machines Philippe Mathieu-Daudé
2020-10-19 14:51 ` Richard Henderson
2020-10-19 16:12 ` Thomas Huth
2020-10-20 14:37 ` Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).