mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

riscv: do not use ram_size global

Browse Source 
Use the machine properties instead.

Cc: Alistair Francis <Alistair.Francis@wdc.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-10-28 06:16:22 -04:00
parent ead2b283ad
commit 82e6905465
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/riscv/boot.c
View File

@ -120,7 +120,8 @@ target_ulong riscv_load_firmware(const char *firmware_filename,
} }
firmware_size = load_image_targphys_as(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) { if (firmware_size > 0) {
return firmware_load_addr + firmware_size; 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, if (load_image_targphys_as(kernel_filename, kernel_start_addr,
ram_size, NULL) > 0) { current_machine->ram_size, NULL) > 0) {
return kernel_start_addr; return kernel_start_addr;
} }