mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 16:53:55 -06:00
machine: use QAPI struct for boot configuration
As part of converting -boot to a property with a QAPI type, define the struct and use it throughout QEMU to access boot configuration. machine_boot_parse takes care of doing the QemuOpts->QAPI conversion by hand, for now. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20220414165300.555321-2-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
70be1d93f9
commit
97ec4d21e0
18 changed files with 127 additions and 82 deletions
|
@ -111,7 +111,7 @@ static void ppc_core99_init(MachineState *machine)
|
|||
const char *kernel_filename = machine->kernel_filename;
|
||||
const char *kernel_cmdline = machine->kernel_cmdline;
|
||||
const char *initrd_filename = machine->initrd_filename;
|
||||
const char *boot_device = machine->boot_order;
|
||||
const char *boot_device = machine->boot_config.order;
|
||||
Core99MachineState *core99_machine = CORE99_MACHINE(machine);
|
||||
PowerPCCPU *cpu = NULL;
|
||||
CPUPPCState *env = NULL;
|
||||
|
|
|
@ -82,7 +82,7 @@ static void ppc_heathrow_init(MachineState *machine)
|
|||
{
|
||||
ram_addr_t ram_size = machine->ram_size;
|
||||
const char *bios_name = machine->firmware ?: PROM_FILENAME;
|
||||
const char *boot_device = machine->boot_order;
|
||||
const char *boot_device = machine->boot_config.order;
|
||||
PowerPCCPU *cpu = NULL;
|
||||
CPUPPCState *env = NULL;
|
||||
char *filename;
|
||||
|
|
|
@ -381,7 +381,7 @@ static void ibm_40p_init(MachineState *machine)
|
|||
}
|
||||
boot_device = 'm';
|
||||
} else {
|
||||
boot_device = machine->boot_order[0];
|
||||
boot_device = machine->boot_config.order[0];
|
||||
}
|
||||
|
||||
fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)machine->smp.max_cpus);
|
||||
|
|
|
@ -1044,8 +1044,8 @@ static void spapr_dt_chosen(SpaprMachineState *spapr, void *fdt, bool reset)
|
|||
_FDT(fdt_setprop(fdt, chosen, "qemu,boot-kernel-le", NULL, 0));
|
||||
}
|
||||
}
|
||||
if (boot_menu) {
|
||||
_FDT((fdt_setprop_cell(fdt, chosen, "qemu,boot-menu", boot_menu)));
|
||||
if (machine->boot_config.has_menu && machine->boot_config.menu) {
|
||||
_FDT((fdt_setprop_cell(fdt, chosen, "qemu,boot-menu", true)));
|
||||
}
|
||||
_FDT(fdt_setprop_cell(fdt, chosen, "qemu,graphic-width", graphic_width));
|
||||
_FDT(fdt_setprop_cell(fdt, chosen, "qemu,graphic-height", graphic_height));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue