[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 018/136] arm/kzm: drop RAM size fixup
From: |
Paolo Bonzini |
Subject: |
[PULL 018/136] arm/kzm: drop RAM size fixup |
Date: |
Tue, 25 Feb 2020 12:49:08 +0100 |
From: Igor Mammedov <address@hidden>
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>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <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",
--
1.8.3.1
- [PULL 007/136] vl.c: ensure that ram_size matches size of machine.memory-backend, (continued)
- [PULL 007/136] vl.c: ensure that ram_size matches size of machine.memory-backend, Paolo Bonzini, 2020/02/25
- [PULL 011/136] arm/collie: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 004/136] machine: introduce convenience MachineState::ram, Paolo Bonzini, 2020/02/25
- [PULL 002/136] machine: introduce memory-backend property, Paolo Bonzini, 2020/02/25
- [PULL 006/136] vl.c: move -m parsing after memory backends has been processed, Paolo Bonzini, 2020/02/25
- [PULL 012/136] arm/cubieboard: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 009/136] arm/aspeed: actually check RAM size, Paolo Bonzini, 2020/02/25
- [PULL 008/136] alpha/dp264: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 014/136] arm/highbank: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 016/136] arm/imx25_pdk: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 018/136] arm/kzm: drop RAM size fixup,
Paolo Bonzini <=
- [PULL 005/136] initialize MachineState::ram in NUMA case, Paolo Bonzini, 2020/02/25
- [PULL 013/136] arm/digic_boards: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 010/136] arm/aspeed: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 015/136] arm/imx25_pdk: drop RAM size fixup, Paolo Bonzini, 2020/02/25
- [PULL 022/136] arm/mps2-tz: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 023/136] arm/mps2: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 025/136] arm/nseries: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 017/136] arm/integratorcp: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 027/136] arm/palm: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 024/136] arm/musicpal: use memdev for RAM, Paolo Bonzini, 2020/02/25