[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 051/136] mips/mips_fulong2e: drop RAM size fixup
From: |
Paolo Bonzini |
Subject: |
[PULL 051/136] mips/mips_fulong2e: drop RAM size fixup |
Date: |
Tue, 25 Feb 2020 12:49:41 +0100 |
From: Igor Mammedov <address@hidden>
If user provided non-sense RAM size, board will complain and
continue running with max RAM size supported.
Also RAM is going to be allocated by generic code, so it won't be
possible for board to fix things up for user.
Make it error message and exit to force user fix CLI,
instead of accepting non-sense CLI values.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
---
hw/mips/mips_fulong2e.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 2e043cb..cf00211 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -296,7 +296,6 @@ static void mips_fulong2e_init(MachineState *machine)
MemoryRegion *address_space_mem = get_system_memory();
MemoryRegion *ram = g_new(MemoryRegion, 1);
MemoryRegion *bios = g_new(MemoryRegion, 1);
- ram_addr_t ram_size = machine->ram_size;
long bios_size;
uint8_t *spd_data;
Error *err = NULL;
@@ -315,10 +314,14 @@ static void mips_fulong2e_init(MachineState *machine)
qemu_register_reset(main_cpu_reset, cpu);
/* TODO: support more than 256M RAM as highmem */
- ram_size = 256 * MiB;
+ if (machine->ram_size != 256 * MiB) {
+ error_report("Invalid RAM size, should be 256MB");
+ exit(EXIT_FAILURE);
+ }
/* allocate RAM */
- memory_region_allocate_system_memory(ram, NULL, "fulong2e.ram", ram_size);
+ memory_region_allocate_system_memory(ram, NULL, "fulong2e.ram",
+ machine->ram_size);
memory_region_init_ram(bios, NULL, "fulong2e.bios", BIOS_SIZE,
&error_fatal);
memory_region_set_readonly(bios, true);
@@ -332,7 +335,7 @@ static void mips_fulong2e_init(MachineState *machine)
*/
if (kernel_filename) {
- loaderparams.ram_size = ram_size;
+ loaderparams.ram_size = machine->ram_size;
loaderparams.kernel_filename = kernel_filename;
loaderparams.kernel_cmdline = kernel_cmdline;
loaderparams.initrd_filename = initrd_filename;
@@ -378,7 +381,7 @@ static void mips_fulong2e_init(MachineState *machine)
}
/* Populate SPD eeprom data */
- spd_data = spd_data_generate(DDR, ram_size, &err);
+ spd_data = spd_data_generate(DDR, machine->ram_size, &err);
if (err) {
warn_report_err(err);
}
--
1.8.3.1
- [PULL 046/136] m68k/an5206: use memdev for RAM, (continued)
- [PULL 046/136] m68k/an5206: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 045/136] lm32/milkymist: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 048/136] m68k/mcf5208: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 047/136] m68k/q800: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 050/136] mips/boston: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 056/136] mips/mips_mipssim: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 055/136] mips/mips_malta: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 054/136] mips/mips_jazz: add max ram size check, Paolo Bonzini, 2020/02/25
- [PULL 052/136] mips/mips_fulong2e: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 057/136] mips/mips_r4k: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 051/136] mips/mips_fulong2e: drop RAM size fixup,
Paolo Bonzini <=
- [PULL 067/136] ppc/spapr: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 064/136] ppc/ppc405_boards: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 049/136] m68k/next-cube: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 053/136] mips/mips_jazz: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 059/136] ppc/e500: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 063/136] ppc/ppc405_boards: add RAM size checks, Paolo Bonzini, 2020/02/25
- [PULL 062/136] ppc/pnv: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 058/136] ppc/e500: drop RAM size fixup, Paolo Bonzini, 2020/02/25
- [PULL 065/136] ppc/{ppc440_bamboo, sam460ex}: drop RAM size fixup, Paolo Bonzini, 2020/02/25
- [PULL 066/136] ppc/{ppc440_bamboo, sam460ex}: use memdev for RAM, Paolo Bonzini, 2020/02/25