From: Leon Alrae Date: Tue, 15 Mar 2016 09:59:32 +0000 (+0000) Subject: hw/mips_malta: remove CPUMIPSState from the write_bootloader() X-Git-Tag: v2.6.0-rc0~2^2~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc518af0b2df156b68551cb1585a9db17c2b0084;p=thirdparty%2Fqemu.git hw/mips_malta: remove CPUMIPSState from the write_bootloader() Remove CPUMIPSState from the write_bootloader() argument list as it is not used in the function. Signed-off-by: Leon Alrae --- diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 4ff1bb2562d..609f6dcff8f 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -608,8 +608,8 @@ static void network_init(PCIBus *pci_bus) a3 - RAM size in bytes */ -static void write_bootloader (CPUMIPSState *env, uint8_t *base, - int64_t run_addr, int64_t kernel_entry) +static void write_bootloader(uint8_t *base, int64_t run_addr, + int64_t kernel_entry) { uint32_t *p; @@ -1063,11 +1063,11 @@ void mips_malta_init(MachineState *machine) loaderparams.initrd_filename = initrd_filename; kernel_entry = load_kernel(); - write_bootloader(env, memory_region_get_ram_ptr(bios), + write_bootloader(memory_region_get_ram_ptr(bios), bootloader_run_addr, kernel_entry); if (kvm_enabled()) { /* Write the bootloader code @ the end of RAM, 1MB reserved */ - write_bootloader(env, memory_region_get_ram_ptr(ram_low_preio) + + write_bootloader(memory_region_get_ram_ptr(ram_low_preio) + ram_low_size, bootloader_run_addr, kernel_entry); }