From 82e69054656f86d00b263437ad04395a5f834248 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 28 Oct 2020 06:16:22 -0400 Subject: [PATCH] riscv: do not use ram_size global Use the machine properties instead. Cc: Alistair Francis Signed-off-by: Paolo Bonzini --- 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; }