mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 16:23:55 -06:00
hw/loongarch: Rename LoongArchMachineState with LoongArchVirtMachineState
Rename LoongArchMachineState with LoongArchVirtMachineState, and change variable name LoongArchMachineState *lams with LoongArchVirtMachineState *lvms. Rename function specific for virtmachine loongarch_xxx() with virt_xxx(). However some common functions keep unchanged such as loongarch_acpi_setup()/loongarch_load_kernel(), since there functions can be used for real hw boards. Signed-off-by: Bibo Mao <maobibo@loongson.cn> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <20240508031110.2507477-3-maobibo@loongson.cn> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
parent
df0d93c1e2
commit
d804ad98f5
6 changed files with 226 additions and 224 deletions
|
@ -259,10 +259,10 @@ static void fw_cfg_add_kernel_info(struct loongarch_boot_info *info,
|
|||
}
|
||||
}
|
||||
|
||||
static void loongarch_firmware_boot(LoongArchMachineState *lams,
|
||||
static void loongarch_firmware_boot(LoongArchVirtMachineState *lvms,
|
||||
struct loongarch_boot_info *info)
|
||||
{
|
||||
fw_cfg_add_kernel_info(info, lams->fw_cfg);
|
||||
fw_cfg_add_kernel_info(info, lvms->fw_cfg);
|
||||
}
|
||||
|
||||
static void init_boot_rom(struct loongarch_boot_info *info, void *p)
|
||||
|
@ -319,7 +319,7 @@ static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info)
|
|||
|
||||
void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info)
|
||||
{
|
||||
LoongArchMachineState *lams = LOONGARCH_VIRT_MACHINE(ms);
|
||||
LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(ms);
|
||||
int i;
|
||||
|
||||
/* register reset function */
|
||||
|
@ -331,8 +331,8 @@ void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info)
|
|||
info->kernel_cmdline = ms->kernel_cmdline;
|
||||
info->initrd_filename = ms->initrd_filename;
|
||||
|
||||
if (lams->bios_loaded) {
|
||||
loongarch_firmware_boot(lams, info);
|
||||
if (lvms->bios_loaded) {
|
||||
loongarch_firmware_boot(lvms, info);
|
||||
} else {
|
||||
loongarch_direct_kernel_boot(info);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue