summary refs log tree commit diff stats
path: root/hw/loongarch/boot.c
diff options
context:
space:
mode:
authorBibo Mao <maobibo@loongson.cn>2024-05-08 11:11:07 +0800
committerPhilippe Mathieu-Daudé <philmd@linaro.org>2024-05-09 00:07:21 +0200
commitd804ad98f51cc6ae795ff9c9890db66bae513214 (patch)
tree55198e85d5d38c3b084b7b00d88ffaec0ccfca56 /hw/loongarch/boot.c
parentdf0d93c1e20db0c2b683a823a8e95208f5dc09ff (diff)
downloadfocaccia-qemu-d804ad98f51cc6ae795ff9c9890db66bae513214.tar.gz
focaccia-qemu-d804ad98f51cc6ae795ff9c9890db66bae513214.zip
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>
Diffstat (limited to 'hw/loongarch/boot.c')
-rw-r--r--hw/loongarch/boot.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index e37512729d..b8e1aa18d5 100644
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -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);
     }