[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 046/113] riscv: do not use ram_size global
From: |
Paolo Bonzini |
Subject: |
[PULL 046/113] riscv: do not use ram_size global |
Date: |
Wed, 2 Dec 2020 03:07:42 -0500 |
Use the machine properties instead.
Cc: Alistair Francis <Alistair.Francis@wdc.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/riscv/boot.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
index 9b3fe3fb1e..70a9bf8f5d 100644
--- a/hw/riscv/boot.c
+++ b/hw/riscv/boot.c
@@ -120,7 +120,8 @@ target_ulong riscv_load_firmware(const char
*firmware_filename,
}
firmware_size = load_image_targphys_as(firmware_filename,
- firmware_load_addr, ram_size, NULL);
+ firmware_load_addr,
+ current_machine->ram_size, NULL);
if (firmware_size > 0) {
return firmware_load_addr + firmware_size;
@@ -148,7 +149,7 @@ target_ulong riscv_load_kernel(const char *kernel_filename,
}
if (load_image_targphys_as(kernel_filename, kernel_start_addr,
- ram_size, NULL) > 0) {
+ current_machine->ram_size, NULL) > 0) {
return kernel_start_addr;
}
--
2.26.2
- [PULL 036/113] arm: do not use ram_size global, (continued)
- [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, 2020/12/02
- [PULL 046/113] riscv: do not use ram_size global,
Paolo Bonzini <=
- [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
- [PULL 039/113] i386: do not use ram_size global, Paolo Bonzini, 2020/12/02