[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 18/80] arm/kzm: drop RAM size fixup
From: |
Igor Mammedov |
Subject: |
[PATCH v4 18/80] arm/kzm: drop RAM size fixup |
Date: |
Fri, 31 Jan 2020 16:08:48 +0100 |
If the user provided too large a RAM size, the code used to
complain and trim it to the max size. Now that RAM is allocated by
generic code, that's no longer possible, so generate an error and
exit instead.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Peter Chubb <address@hidden>
---
v3:
* rephrase commit message in nicer way
("Chubb, Peter (Data61, Kensington NSW)" <address@hidden>)
* reword error message and use size_to_str() to pretty print suggested size
("Chubb, Peter (Data61, Kensington NSW)" <address@hidden>)
---
hw/arm/kzm.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
index 1d5ef28..94cbac1 100644
--- a/hw/arm/kzm.c
+++ b/hw/arm/kzm.c
@@ -25,6 +25,7 @@
#include "hw/char/serial.h"
#include "sysemu/qtest.h"
#include "sysemu/sysemu.h"
+#include "qemu/cutils.h"
/* Memory map for Kzm Emulation Baseboard:
* 0x00000000-0x7fffffff See i.MX31 SOC for support
@@ -78,10 +79,10 @@ static void kzm_init(MachineState *machine)
/* Check the amount of memory is compatible with the SOC */
if (machine->ram_size > (FSL_IMX31_SDRAM0_SIZE + FSL_IMX31_SDRAM1_SIZE)) {
- warn_report("RAM size " RAM_ADDR_FMT " above max supported, "
- "reduced to %x", machine->ram_size,
- FSL_IMX31_SDRAM0_SIZE + FSL_IMX31_SDRAM1_SIZE);
- machine->ram_size = FSL_IMX31_SDRAM0_SIZE + FSL_IMX31_SDRAM1_SIZE;
+ char *sz = size_to_str(FSL_IMX31_SDRAM0_SIZE + FSL_IMX31_SDRAM1_SIZE);
+ error_report("RAM size more than %s is not supported", sz);
+ g_free(sz);
+ exit(EXIT_FAILURE);
}
memory_region_allocate_system_memory(&s->ram, NULL, "kzm.ram",
--
2.7.4
- [PATCH v4 10/80] arm/aspeed: use memdev for RAM, (continued)
- [PATCH v4 10/80] arm/aspeed: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 14/80] arm/highbank: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 09/80] arm/aspeed: actually check RAM size, Igor Mammedov, 2020/01/31
- [PATCH v4 13/80] arm/digic_boards: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 12/80] arm/cubieboard: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 03/80] machine: alias -mem-path and -mem-prealloc into memory-foo backend, Igor Mammedov, 2020/01/31
- [PATCH v4 19/80] arm/kzm: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 16/80] arm/imx25_pdk: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 15/80] arm/imx25_pdk: drop RAM size fixup, Igor Mammedov, 2020/01/31
- [PATCH v4 23/80] arm/mps2: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 18/80] arm/kzm: drop RAM size fixup,
Igor Mammedov <=
- [PATCH v4 17/80] arm/integratorcp: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 20/80] arm/mcimx6ul-evk: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 25/80] arm/nseries: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 26/80] arm/omap_sx1: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 27/80] arm/palm: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 21/80] arm/mcimx7d-sabre: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 24/80] arm/musicpal: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 28/80] arm/raspi: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 29/80] arm/sabrelite: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 22/80] arm/mps2-tz: use memdev for RAM, Igor Mammedov, 2020/01/31