diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-05-07 12:55:02 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-05-07 12:55:02 +0100 |
| commit | ff3dcf28c0b7a3ac261399c3754bf2f410c2e91e (patch) | |
| tree | 6960413e26d642da1be24acc3e0340cbbc1e6d1a /hw/arm/raspi.c | |
| parent | e0561e60f170b220c5d73d185fa8eaa66fa8e6ef (diff) | |
| download | focaccia-qemu-ff3dcf28c0b7a3ac261399c3754bf2f410c2e91e.tar.gz focaccia-qemu-ff3dcf28c0b7a3ac261399c3754bf2f410c2e91e.zip | |
hw/arm/raspi: Diagnose requests for too much RAM
The Raspberry Pi boards have a physical memory map which does not allow for more than 1GB of RAM. Currently if the user tries to ask for more then we fail in a confusing way: $ qemu-system-aarch64 --machine raspi3 -m 8G Unexpected error in visit_type_uintN() at qapi/qapi-visit-core.c:164: qemu-system-aarch64: Parameter 'vcram-base' expects uint32_t Aborted (core dumped) Catch this earlier and diagnose it with a more friendly message: $ qemu-system-aarch64 --machine raspi3 -m 8G qemu-system-aarch64: Requested ram size is too large for this machine: maximum is 1GB Fixes: https://bugs.launchpad.net/qemu/+bug/1794187 Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Diffstat (limited to 'hw/arm/raspi.c')
| -rw-r--r-- | hw/arm/raspi.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 66899c28dc..fe2bb511b9 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -12,6 +12,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -175,6 +176,12 @@ static void raspi_init(MachineState *machine, int version) BusState *bus; DeviceState *carddev; + if (machine->ram_size > 1 * GiB) { + error_report("Requested ram size is too large for this machine: " + "maximum is 1GB"); + exit(1); + } + object_initialize(&s->soc, sizeof(s->soc), version == 3 ? TYPE_BCM2837 : TYPE_BCM2836); object_property_add_child(OBJECT(machine), "soc", OBJECT(&s->soc), |