mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 07:43:54 -06:00
hw/arm: simplify arm_load_dtb
In struct arm_boot_info, kernel_filename, initrd_filename and kernel_cmdline are copied from from MachineState. This patch add MachineState as a parameter into arm_load_dtb() and move the copy chunk of kernel_filename, initrd_filename and kernel_cmdline into arm_load_kernel(). Reviewed-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Liu Jingqi <jingqi.liu@intel.com> Suggested-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Tao Xu <tao3.xu@intel.com> Message-Id: <20190809065731.9097-2-tao3.xu@intel.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Acked-by: Andrew Jeffery <andrew@aj.id.au> Acked-by: Cédric Le Goater <clg@kaod.org> [ehabkost: include hw/boards.h again to fix build failures] Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
14a25a511b
commit
2744ece809
30 changed files with 44 additions and 147 deletions
|
@ -157,13 +157,9 @@ static void setup_boot(MachineState *machine, int version, size_t ram_size)
|
|||
|
||||
binfo.entry = firmware_addr;
|
||||
binfo.firmware_loaded = true;
|
||||
} else {
|
||||
binfo.kernel_filename = machine->kernel_filename;
|
||||
binfo.kernel_cmdline = machine->kernel_cmdline;
|
||||
binfo.initrd_filename = machine->initrd_filename;
|
||||
}
|
||||
|
||||
arm_load_kernel(ARM_CPU(first_cpu), &binfo);
|
||||
arm_load_kernel(ARM_CPU(first_cpu), machine, &binfo);
|
||||
}
|
||||
|
||||
static void raspi_init(MachineState *machine, int version)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue