[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 042/113] mips: do not use ram_size global
From: |
Paolo Bonzini |
Subject: |
[PULL 042/113] mips: do not use ram_size global |
Date: |
Wed, 2 Dec 2020 03:07:38 -0500 |
Use the machine properties or loader parameters instead.
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/mips/fuloong2e.c | 4 ++--
hw/mips/malta.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index 25b679011f..84a2132f85 100644
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -134,14 +134,14 @@ static int64_t load_kernel(CPUMIPSState *env)
initrd_size = get_image_size(loaderparams.initrd_filename);
if (initrd_size > 0) {
initrd_offset = ROUND_UP(kernel_high, INITRD_PAGE_SIZE);
- if (initrd_offset + initrd_size > ram_size) {
+ if (initrd_offset + initrd_size > loaderparams.ram_size) {
error_report("memory too small for initial ram disk '%s'",
loaderparams.initrd_filename);
exit(1);
}
initrd_size = load_image_targphys(loaderparams.initrd_filename,
initrd_offset,
- ram_size - initrd_offset);
+ loaderparams.ram_size -
initrd_offset);
}
if (initrd_size == (target_ulong) -1) {
error_report("could not load initial ram disk '%s'",
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index ef369945d1..467b21849e 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -1087,7 +1087,7 @@ static int64_t load_kernel(void)
}
initrd_size = load_image_targphys(loaderparams.initrd_filename,
initrd_offset,
- ram_size - initrd_offset);
+ loaderparams.ram_size -
initrd_offset);
}
if (initrd_size == (target_ulong) -1) {
error_report("could not load initial ram disk '%s'",
--
2.26.2
- [PULL 038/113] hppa: do not use ram_size global, (continued)
- [PULL 038/113] hppa: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 036/113] arm: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 029/113] ppc: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 032/113] sh4: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 035/113] vl: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 034/113] digic: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 040/113] m68k: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 033/113] sparc: remove bios_name, Paolo Bonzini, 2020/12/02
- [PULL 041/113] microblaze: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 043/113] moxie: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 042/113] mips: do not use ram_size global,
Paolo Bonzini <=
- [PULL 046/113] riscv: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 045/113] ppc: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 049/113] make ram_size local to vl.c, Paolo Bonzini, 2020/12/02
- [PULL 053/113] vl: remove bogus check, Paolo Bonzini, 2020/12/02
- [PULL 044/113] nios2: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 048/113] sparc64: do not use ram_size global, Paolo Bonzini, 2020/12/02
- [PULL 052/113] vl: extract validation of -smp to machine.c, Paolo Bonzini, 2020/12/02
- [PULL 063/113] vl: load plugins as late as possible, Paolo Bonzini, 2020/12/02
- [PULL 054/113] vl: split various early command line options to a separate function, Paolo Bonzini, 2020/12/02
- [PULL 058/113] vl: extract various command line validation snippets to a new function, Paolo Bonzini, 2020/12/02