From nobody Mon Nov 25 14:56:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1714964609064174.10800730103483; Sun, 5 May 2024 20:03:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3ocQ-000787-Ib; Sun, 05 May 2024 23:02:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s3ocO-00074u-2v for qemu-devel@nongnu.org; Sun, 05 May 2024 23:02:20 -0400 Received: from mail.loongson.cn ([114.242.206.163]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3ocH-0008GY-La for qemu-devel@nongnu.org; Sun, 05 May 2024 23:02:19 -0400 Received: from loongson.cn (unknown [10.2.5.213]) by gateway (Coremail) with SMTP id _____8DxKPExSDhmPuIHAA--.22510S3; Mon, 06 May 2024 11:02:09 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by localhost.localdomain (Coremail) with SMTP id AQAAf8DxvlcuSDhmFvwRAA--.31503S4; Mon, 06 May 2024 11:02:08 +0800 (CST) From: Bibo Mao To: Song Gao , Peter Xu , Fabiano Rosas , Laurent Vivier , Thomas Huth Cc: qemu-devel@nongnu.org Subject: [PATCH v3 2/5] hw/loongarch: Rename LoongArchMachineState with VirtMachineState Date: Mon, 6 May 2024 11:02:03 +0800 Message-Id: <20240506030206.2119832-3-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240506030206.2119832-1-maobibo@loongson.cn> References: <20240506030206.2119832-1-maobibo@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: AQAAf8DxvlcuSDhmFvwRAA--.31503S4 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=114.242.206.163; envelope-from=maobibo@loongson.cn; helo=mail.loongson.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1714964612066100009 Content-Type: text/plain; charset="utf-8" Rename LoongArchMachineState with VirtMachineState, and change variable name LoongArchMachineState *lams with VirtMachineState *vms, and rename function loongarch_xxx() with virt_xxx() also. Signed-off-by: Bibo Mao --- hw/loongarch/acpi-build.c | 80 +++++----- hw/loongarch/boot.c | 10 +- hw/loongarch/fw_cfg.c | 2 +- hw/loongarch/fw_cfg.h | 2 +- hw/loongarch/virt.c | 309 ++++++++++++++++++------------------ include/hw/loongarch/virt.h | 8 +- 6 files changed, 205 insertions(+), 206 deletions(-) diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c index 72322cdb1e..b6741809ef 100644 --- a/hw/loongarch/acpi-build.c +++ b/hw/loongarch/acpi-build.c @@ -105,14 +105,14 @@ build_facs(GArray *table_data) =20 /* build MADT */ static void -build_madt(GArray *table_data, BIOSLinker *linker, LoongArchMachineState *= lams) +build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) { - MachineState *ms =3D MACHINE(lams); + MachineState *ms =3D MACHINE(vms); MachineClass *mc =3D MACHINE_GET_CLASS(ms); const CPUArchIdList *arch_ids =3D mc->possible_cpu_arch_ids(ms); int i, arch_id; - AcpiTable table =3D { .sig =3D "APIC", .rev =3D 1, .oem_id =3D lams->o= em_id, - .oem_table_id =3D lams->oem_table_id }; + AcpiTable table =3D { .sig =3D "APIC", .rev =3D 1, .oem_id =3D vms->oe= m_id, + .oem_table_id =3D vms->oem_table_id }; =20 acpi_table_begin(&table, table_data); =20 @@ -167,11 +167,11 @@ build_srat(GArray *table_data, BIOSLinker *linker, Ma= chineState *machine) int i, arch_id, node_id; uint64_t mem_len, mem_base; int nb_numa_nodes =3D machine->numa_state->num_nodes; - LoongArchMachineState *lams =3D VIRT_MACHINE(machine); - MachineClass *mc =3D MACHINE_GET_CLASS(lams); + VirtMachineState *vms =3D VIRT_MACHINE(machine); + MachineClass *mc =3D MACHINE_GET_CLASS(vms); const CPUArchIdList *arch_ids =3D mc->possible_cpu_arch_ids(machine); - AcpiTable table =3D { .sig =3D "SRAT", .rev =3D 1, .oem_id =3D lams->o= em_id, - .oem_table_id =3D lams->oem_table_id }; + AcpiTable table =3D { .sig =3D "SRAT", .rev =3D 1, .oem_id =3D vms->oe= m_id, + .oem_table_id =3D vms->oem_table_id }; =20 acpi_table_begin(&table, table_data); build_append_int_noprefix(table_data, 1, 4); /* Reserved */ @@ -279,13 +279,13 @@ static void build_la_ged_aml(Aml *dsdt, MachineState *machine) { uint32_t event; - LoongArchMachineState *lams =3D VIRT_MACHINE(machine); + VirtMachineState *vms =3D VIRT_MACHINE(machine); =20 build_ged_aml(dsdt, "\\_SB."GED_DEVICE, - HOTPLUG_HANDLER(lams->acpi_ged), + HOTPLUG_HANDLER(vms->acpi_ged), VIRT_SCI_IRQ, AML_SYSTEM_MEMORY, VIRT_GED_EVT_ADDR); - event =3D object_property_get_uint(OBJECT(lams->acpi_ged), + event =3D object_property_get_uint(OBJECT(vms->acpi_ged), "ged-event", &error_abort); if (event & ACPI_GED_MEM_HOTPLUG_EVT) { build_memory_hotplug_aml(dsdt, machine->ram_slots, "\\_SB", NULL, @@ -295,7 +295,7 @@ build_la_ged_aml(Aml *dsdt, MachineState *machine) acpi_dsdt_add_power_button(dsdt); } =20 -static void build_pci_device_aml(Aml *scope, LoongArchMachineState *lams) +static void build_pci_device_aml(Aml *scope, VirtMachineState *vms) { struct GPEXConfig cfg =3D { .mmio64.base =3D VIRT_PCI_MEM_BASE, @@ -305,13 +305,13 @@ static void build_pci_device_aml(Aml *scope, LoongArc= hMachineState *lams) .ecam.base =3D VIRT_PCI_CFG_BASE, .ecam.size =3D VIRT_PCI_CFG_SIZE, .irq =3D VIRT_GSI_BASE + VIRT_DEVICE_IRQS, - .bus =3D lams->pci_bus, + .bus =3D vms->pci_bus, }; =20 acpi_dsdt_add_gpex(scope, &cfg); } =20 -static void build_flash_aml(Aml *scope, LoongArchMachineState *lams) +static void build_flash_aml(Aml *scope, VirtMachineState *vms) { Aml *dev, *crs; MemoryRegion *flash_mem; @@ -322,11 +322,11 @@ static void build_flash_aml(Aml *scope, LoongArchMach= ineState *lams) hwaddr flash1_base; hwaddr flash1_size; =20 - flash_mem =3D pflash_cfi01_get_memory(lams->flash[0]); + flash_mem =3D pflash_cfi01_get_memory(vms->flash[0]); flash0_base =3D flash_mem->addr; flash0_size =3D memory_region_size(flash_mem); =20 - flash_mem =3D pflash_cfi01_get_memory(lams->flash[1]); + flash_mem =3D pflash_cfi01_get_memory(vms->flash[1]); flash1_base =3D flash_mem->addr; flash1_size =3D memory_region_size(flash_mem); =20 @@ -352,7 +352,7 @@ static void build_flash_aml(Aml *scope, LoongArchMachin= eState *lams) } =20 #ifdef CONFIG_TPM -static void acpi_dsdt_add_tpm(Aml *scope, LoongArchMachineState *vms) +static void acpi_dsdt_add_tpm(Aml *scope, VirtMachineState *vms) { PlatformBusDevice *pbus =3D PLATFORM_BUS_DEVICE(vms->platform_bus_dev); hwaddr pbus_base =3D VIRT_PLATFORM_BUS_BASEADDRESS; @@ -391,18 +391,18 @@ static void build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine) { Aml *dsdt, *scope, *pkg; - LoongArchMachineState *lams =3D VIRT_MACHINE(machine); - AcpiTable table =3D { .sig =3D "DSDT", .rev =3D 1, .oem_id =3D lams->o= em_id, - .oem_table_id =3D lams->oem_table_id }; + VirtMachineState *vms =3D VIRT_MACHINE(machine); + AcpiTable table =3D { .sig =3D "DSDT", .rev =3D 1, .oem_id =3D vms->oe= m_id, + .oem_table_id =3D vms->oem_table_id }; =20 acpi_table_begin(&table, table_data); dsdt =3D init_aml_allocator(); build_uart_device_aml(dsdt); - build_pci_device_aml(dsdt, lams); + build_pci_device_aml(dsdt, vms); build_la_ged_aml(dsdt, machine); - build_flash_aml(dsdt, lams); + build_flash_aml(dsdt, vms); #ifdef CONFIG_TPM - acpi_dsdt_add_tpm(dsdt, lams); + acpi_dsdt_add_tpm(dsdt, vms); #endif /* System State Package */ scope =3D aml_scope("\\"); @@ -421,7 +421,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, Mach= ineState *machine) =20 static void acpi_build(AcpiBuildTables *tables, MachineState *machine) { - LoongArchMachineState *lams =3D VIRT_MACHINE(machine); + VirtMachineState *vms =3D VIRT_MACHINE(machine); GArray *table_offsets; AcpiFadtData fadt_data; unsigned facs, rsdt, dsdt; @@ -455,14 +455,14 @@ static void acpi_build(AcpiBuildTables *tables, Machi= neState *machine) fadt_data.dsdt_tbl_offset =3D &dsdt; fadt_data.xdsdt_tbl_offset =3D &dsdt; build_fadt(tables_blob, tables->linker, &fadt_data, - lams->oem_id, lams->oem_table_id); + vms->oem_id, vms->oem_table_id); =20 acpi_add_table(table_offsets, tables_blob); - build_madt(tables_blob, tables->linker, lams); + build_madt(tables_blob, tables->linker, vms); =20 acpi_add_table(table_offsets, tables_blob); build_pptt(tables_blob, tables->linker, machine, - lams->oem_id, lams->oem_table_id); + vms->oem_id, vms->oem_table_id); =20 acpi_add_table(table_offsets, tables_blob); build_srat(tables_blob, tables->linker, machine); @@ -470,13 +470,13 @@ static void acpi_build(AcpiBuildTables *tables, Machi= neState *machine) if (machine->numa_state->num_nodes) { if (machine->numa_state->have_numa_distance) { acpi_add_table(table_offsets, tables_blob); - build_slit(tables_blob, tables->linker, machine, lams->oem_id, - lams->oem_table_id); + build_slit(tables_blob, tables->linker, machine, vms->oem_id, + vms->oem_table_id); } if (machine->numa_state->hmat_enabled) { acpi_add_table(table_offsets, tables_blob); build_hmat(tables_blob, tables->linker, machine->numa_state, - lams->oem_id, lams->oem_table_id); + vms->oem_id, vms->oem_table_id); } } =20 @@ -486,8 +486,8 @@ static void acpi_build(AcpiBuildTables *tables, Machine= State *machine) .base =3D cpu_to_le64(VIRT_PCI_CFG_BASE), .size =3D cpu_to_le64(VIRT_PCI_CFG_SIZE), }; - build_mcfg(tables_blob, tables->linker, &mcfg, lams->oem_id, - lams->oem_table_id); + build_mcfg(tables_blob, tables->linker, &mcfg, vms->oem_id, + vms->oem_table_id); } =20 #ifdef CONFIG_TPM @@ -495,8 +495,8 @@ static void acpi_build(AcpiBuildTables *tables, Machine= State *machine) if (tpm_get_version(tpm_find()) =3D=3D TPM_VERSION_2_0) { acpi_add_table(table_offsets, tables_blob); build_tpm2(tables_blob, tables->linker, - tables->tcpalog, lams->oem_id, - lams->oem_table_id); + tables->tcpalog, vms->oem_id, + vms->oem_table_id); } #endif /* Add tables supplied by user (if any) */ @@ -510,13 +510,13 @@ static void acpi_build(AcpiBuildTables *tables, Machi= neState *machine) /* RSDT is pointed to by RSDP */ rsdt =3D tables_blob->len; build_rsdt(tables_blob, tables->linker, table_offsets, - lams->oem_id, lams->oem_table_id); + vms->oem_id, vms->oem_table_id); =20 /* RSDP is in FSEG memory, so allocate it separately */ { AcpiRsdpData rsdp_data =3D { .revision =3D 0, - .oem_id =3D lams->oem_id, + .oem_id =3D vms->oem_id, .xsdt_tbl_offset =3D NULL, .rsdt_tbl_offset =3D &rsdt, }; @@ -593,17 +593,17 @@ static const VMStateDescription vmstate_acpi_build = =3D { }, }; =20 -void loongarch_acpi_setup(LoongArchMachineState *lams) +void virt_acpi_setup(VirtMachineState *vms) { AcpiBuildTables tables; AcpiBuildState *build_state; =20 - if (!lams->fw_cfg) { + if (!vms->fw_cfg) { ACPI_BUILD_DPRINTF("No fw cfg. Bailing out.\n"); return; } =20 - if (!loongarch_is_acpi_enabled(lams)) { + if (!virt_is_acpi_enabled(vms)) { ACPI_BUILD_DPRINTF("ACPI disabled. Bailing out.\n"); return; } @@ -611,7 +611,7 @@ void loongarch_acpi_setup(LoongArchMachineState *lams) build_state =3D g_malloc0(sizeof *build_state); =20 acpi_build_tables_init(&tables); - acpi_build(&tables, MACHINE(lams)); + acpi_build(&tables, MACHINE(vms)); =20 /* Now expose it all to Guest */ build_state->table_mr =3D acpi_add_rom_blob(acpi_build_update, diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c index e46c70b1b3..89f082aa16 100644 --- a/hw/loongarch/boot.c +++ b/hw/loongarch/boot.c @@ -256,10 +256,10 @@ static void fw_cfg_add_kernel_info(struct loongarch_b= oot_info *info, } } =20 -static void loongarch_firmware_boot(LoongArchMachineState *lams, +static void loongarch_firmware_boot(VirtMachineState *vms, struct loongarch_boot_info *info) { - fw_cfg_add_kernel_info(info, lams->fw_cfg); + fw_cfg_add_kernel_info(info, vms->fw_cfg); } =20 static void init_boot_rom(struct loongarch_boot_info *info, void *p) @@ -316,7 +316,7 @@ static void loongarch_direct_kernel_boot(struct loongar= ch_boot_info *info) =20 void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *i= nfo) { - LoongArchMachineState *lams =3D VIRT_MACHINE(ms); + VirtMachineState *vms =3D VIRT_MACHINE(ms); int i; =20 /* register reset function */ @@ -328,8 +328,8 @@ void loongarch_load_kernel(MachineState *ms, struct loo= ngarch_boot_info *info) info->kernel_cmdline =3D ms->kernel_cmdline; info->initrd_filename =3D ms->initrd_filename; =20 - if (lams->bios_loaded) { - loongarch_firmware_boot(lams, info); + if (vms->bios_loaded) { + loongarch_firmware_boot(vms, info); } else { loongarch_direct_kernel_boot(info); } diff --git a/hw/loongarch/fw_cfg.c b/hw/loongarch/fw_cfg.c index f15a17416c..35aeb2decb 100644 --- a/hw/loongarch/fw_cfg.c +++ b/hw/loongarch/fw_cfg.c @@ -17,7 +17,7 @@ static void fw_cfg_boot_set(void *opaque, const char *boo= t_device, fw_cfg_modify_i16(opaque, FW_CFG_BOOT_DEVICE, boot_device[0]); } =20 -FWCfgState *loongarch_fw_cfg_init(ram_addr_t ram_size, MachineState *ms) +FWCfgState *virt_fw_cfg_init(ram_addr_t ram_size, MachineState *ms) { FWCfgState *fw_cfg; int max_cpus =3D ms->smp.max_cpus; diff --git a/hw/loongarch/fw_cfg.h b/hw/loongarch/fw_cfg.h index 7c0de4db4a..27ee68286e 100644 --- a/hw/loongarch/fw_cfg.h +++ b/hw/loongarch/fw_cfg.h @@ -11,5 +11,5 @@ #include "hw/boards.h" #include "hw/nvram/fw_cfg.h" =20 -FWCfgState *loongarch_fw_cfg_init(ram_addr_t ram_size, MachineState *ms); +FWCfgState *virt_fw_cfg_init(ram_addr_t ram_size, MachineState *ms); #endif diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index e343974b48..c8d697f38f 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -46,7 +46,7 @@ #include "hw/block/flash.h" #include "qemu/error-report.h" =20 -static PFlashCFI01 *virt_flash_create1(LoongArchMachineState *lams, +static PFlashCFI01 *virt_flash_create1(VirtMachineState *vms, const char *name, const char *alias_prop_name) { @@ -61,16 +61,16 @@ static PFlashCFI01 *virt_flash_create1(LoongArchMachine= State *lams, qdev_prop_set_uint16(dev, "id2", 0x00); qdev_prop_set_uint16(dev, "id3", 0x00); qdev_prop_set_string(dev, "name", name); - object_property_add_child(OBJECT(lams), name, OBJECT(dev)); - object_property_add_alias(OBJECT(lams), alias_prop_name, + object_property_add_child(OBJECT(vms), name, OBJECT(dev)); + object_property_add_alias(OBJECT(vms), alias_prop_name, OBJECT(dev), "drive"); return PFLASH_CFI01(dev); } =20 -static void virt_flash_create(LoongArchMachineState *lams) +static void virt_flash_create(VirtMachineState *vms) { - lams->flash[0] =3D virt_flash_create1(lams, "virt.flash0", "pflash0"); - lams->flash[1] =3D virt_flash_create1(lams, "virt.flash1", "pflash1"); + vms->flash[0] =3D virt_flash_create1(vms, "virt.flash0", "pflash0"); + vms->flash[1] =3D virt_flash_create1(vms, "virt.flash1", "pflash1"); } =20 static void virt_flash_map1(PFlashCFI01 *flash, @@ -96,20 +96,20 @@ static void virt_flash_map1(PFlashCFI01 *flash, sysbus_mmio_get_region(SYS_BUS_DEVICE(dev)= , 0)); } =20 -static void virt_flash_map(LoongArchMachineState *lams, +static void virt_flash_map(VirtMachineState *vms, MemoryRegion *sysmem) { - PFlashCFI01 *flash0 =3D lams->flash[0]; - PFlashCFI01 *flash1 =3D lams->flash[1]; + PFlashCFI01 *flash0 =3D vms->flash[0]; + PFlashCFI01 *flash1 =3D vms->flash[1]; =20 virt_flash_map1(flash0, VIRT_FLASH0_BASE, VIRT_FLASH0_SIZE, sysmem); virt_flash_map1(flash1, VIRT_FLASH1_BASE, VIRT_FLASH1_SIZE, sysmem); } =20 -static void fdt_add_cpuic_node(LoongArchMachineState *lams, +static void fdt_add_cpuic_node(VirtMachineState *vms, uint32_t *cpuintc_phandle) { - MachineState *ms =3D MACHINE(lams); + MachineState *ms =3D MACHINE(vms); char *nodename; =20 *cpuintc_phandle =3D qemu_fdt_alloc_phandle(ms->fdt); @@ -123,11 +123,11 @@ static void fdt_add_cpuic_node(LoongArchMachineState = *lams, g_free(nodename); } =20 -static void fdt_add_eiointc_node(LoongArchMachineState *lams, +static void fdt_add_eiointc_node(VirtMachineState *vms, uint32_t *cpuintc_phandle, uint32_t *eiointc_phandle) { - MachineState *ms =3D MACHINE(lams); + MachineState *ms =3D MACHINE(vms); char *nodename; hwaddr extioi_base =3D APIC_BASE; hwaddr extioi_size =3D EXTIOI_SIZE; @@ -148,11 +148,11 @@ static void fdt_add_eiointc_node(LoongArchMachineStat= e *lams, g_free(nodename); } =20 -static void fdt_add_pch_pic_node(LoongArchMachineState *lams, +static void fdt_add_pch_pic_node(VirtMachineState *vms, uint32_t *eiointc_phandle, uint32_t *pch_pic_phandle) { - MachineState *ms =3D MACHINE(lams); + MachineState *ms =3D MACHINE(vms); char *nodename; hwaddr pch_pic_base =3D VIRT_PCH_REG_BASE; hwaddr pch_pic_size =3D VIRT_PCH_REG_SIZE; @@ -173,11 +173,11 @@ static void fdt_add_pch_pic_node(LoongArchMachineStat= e *lams, g_free(nodename); } =20 -static void fdt_add_pch_msi_node(LoongArchMachineState *lams, +static void fdt_add_pch_msi_node(VirtMachineState *vms, uint32_t *eiointc_phandle, uint32_t *pch_msi_phandle) { - MachineState *ms =3D MACHINE(lams); + MachineState *ms =3D MACHINE(vms); char *nodename; hwaddr pch_msi_base =3D VIRT_PCH_MSI_ADDR_LOW; hwaddr pch_msi_size =3D VIRT_PCH_MSI_SIZE; @@ -201,9 +201,9 @@ static void fdt_add_pch_msi_node(LoongArchMachineState = *lams, g_free(nodename); } =20 -static void fdt_add_flash_node(LoongArchMachineState *lams) +static void fdt_add_flash_node(VirtMachineState *vms) { - MachineState *ms =3D MACHINE(lams); + MachineState *ms =3D MACHINE(vms); char *nodename; MemoryRegion *flash_mem; =20 @@ -213,11 +213,11 @@ static void fdt_add_flash_node(LoongArchMachineState = *lams) hwaddr flash1_base; hwaddr flash1_size; =20 - flash_mem =3D pflash_cfi01_get_memory(lams->flash[0]); + flash_mem =3D pflash_cfi01_get_memory(vms->flash[0]); flash0_base =3D flash_mem->addr; flash0_size =3D memory_region_size(flash_mem); =20 - flash_mem =3D pflash_cfi01_get_memory(lams->flash[1]); + flash_mem =3D pflash_cfi01_get_memory(vms->flash[1]); flash1_base =3D flash_mem->addr; flash1_size =3D memory_region_size(flash_mem); =20 @@ -231,13 +231,13 @@ static void fdt_add_flash_node(LoongArchMachineState = *lams) g_free(nodename); } =20 -static void fdt_add_rtc_node(LoongArchMachineState *lams, +static void fdt_add_rtc_node(VirtMachineState *vms, uint32_t *pch_pic_phandle) { char *nodename; hwaddr base =3D VIRT_RTC_REG_BASE; hwaddr size =3D VIRT_RTC_LEN; - MachineState *ms =3D MACHINE(lams); + MachineState *ms =3D MACHINE(vms); =20 nodename =3D g_strdup_printf("/rtc@%" PRIx64, base); qemu_fdt_add_subnode(ms->fdt, nodename); @@ -251,13 +251,13 @@ static void fdt_add_rtc_node(LoongArchMachineState *l= ams, g_free(nodename); } =20 -static void fdt_add_uart_node(LoongArchMachineState *lams, +static void fdt_add_uart_node(VirtMachineState *vms, uint32_t *pch_pic_phandle) { char *nodename; hwaddr base =3D VIRT_UART_BASE; hwaddr size =3D VIRT_UART_SIZE; - MachineState *ms =3D MACHINE(lams); + MachineState *ms =3D MACHINE(vms); =20 nodename =3D g_strdup_printf("/serial@%" PRIx64, base); qemu_fdt_add_subnode(ms->fdt, nodename); @@ -272,11 +272,11 @@ static void fdt_add_uart_node(LoongArchMachineState *= lams, g_free(nodename); } =20 -static void create_fdt(LoongArchMachineState *lams) +static void create_fdt(VirtMachineState *vms) { - MachineState *ms =3D MACHINE(lams); + MachineState *ms =3D MACHINE(vms); =20 - ms->fdt =3D create_device_tree(&lams->fdt_size); + ms->fdt =3D create_device_tree(&vms->fdt_size); if (!ms->fdt) { error_report("create_device_tree() failed"); exit(1); @@ -290,10 +290,10 @@ static void create_fdt(LoongArchMachineState *lams) qemu_fdt_add_subnode(ms->fdt, "/chosen"); } =20 -static void fdt_add_cpu_nodes(const LoongArchMachineState *lams) +static void fdt_add_cpu_nodes(const VirtMachineState *vms) { int num; - const MachineState *ms =3D MACHINE(lams); + const MachineState *ms =3D MACHINE(vms); int smp_cpus =3D ms->smp.cpus; =20 qemu_fdt_add_subnode(ms->fdt, "/cpus"); @@ -347,11 +347,11 @@ static void fdt_add_cpu_nodes(const LoongArchMachineS= tate *lams) } } =20 -static void fdt_add_fw_cfg_node(const LoongArchMachineState *lams) +static void fdt_add_fw_cfg_node(const VirtMachineState *vms) { char *nodename; hwaddr base =3D VIRT_FWCFG_BASE; - const MachineState *ms =3D MACHINE(lams); + const MachineState *ms =3D MACHINE(vms); =20 nodename =3D g_strdup_printf("/fw_cfg@%" PRIx64, base); qemu_fdt_add_subnode(ms->fdt, nodename); @@ -363,7 +363,7 @@ static void fdt_add_fw_cfg_node(const LoongArchMachineS= tate *lams) g_free(nodename); } =20 -static void fdt_add_pcie_irq_map_node(const LoongArchMachineState *lams, +static void fdt_add_pcie_irq_map_node(const VirtMachineState *vms, char *nodename, uint32_t *pch_pic_phandle) { @@ -371,7 +371,7 @@ static void fdt_add_pcie_irq_map_node(const LoongArchMa= chineState *lams, uint32_t irq_map_stride =3D 0; uint32_t full_irq_map[GPEX_NUM_IRQS *GPEX_NUM_IRQS * 10] =3D {}; uint32_t *irq_map =3D full_irq_map; - const MachineState *ms =3D MACHINE(lams); + const MachineState *ms =3D MACHINE(vms); =20 /* This code creates a standard swizzle of interrupts such that * each device's first interrupt is based on it's PCI_SLOT number. @@ -416,7 +416,7 @@ static void fdt_add_pcie_irq_map_node(const LoongArchMa= chineState *lams, 0x1800, 0, 0, 0x7); } =20 -static void fdt_add_pcie_node(const LoongArchMachineState *lams, +static void fdt_add_pcie_node(const VirtMachineState *vms, uint32_t *pch_pic_phandle, uint32_t *pch_msi_phandle) { @@ -429,7 +429,7 @@ static void fdt_add_pcie_node(const LoongArchMachineSta= te *lams, hwaddr size_pcie =3D VIRT_PCI_CFG_SIZE; hwaddr base =3D base_pcie; =20 - const MachineState *ms =3D MACHINE(lams); + const MachineState *ms =3D MACHINE(vms); =20 nodename =3D g_strdup_printf("/pcie@%" PRIx64, base); qemu_fdt_add_subnode(ms->fdt, nodename); @@ -452,7 +452,7 @@ static void fdt_add_pcie_node(const LoongArchMachineSta= te *lams, qemu_fdt_setprop_cells(ms->fdt, nodename, "msi-map", 0, *pch_msi_phandle, 0, 0x10000); =20 - fdt_add_pcie_irq_map_node(lams, nodename, pch_pic_phandle); + fdt_add_pcie_irq_map_node(vms, nodename, pch_pic_phandle); =20 g_free(nodename); } @@ -473,15 +473,15 @@ static void fdt_add_memory_node(MachineState *ms, g_free(nodename); } =20 -static void virt_build_smbios(LoongArchMachineState *lams) +static void virt_build_smbios(VirtMachineState *vms) { - MachineState *ms =3D MACHINE(lams); - MachineClass *mc =3D MACHINE_GET_CLASS(lams); + MachineState *ms =3D MACHINE(vms); + MachineClass *mc =3D MACHINE_GET_CLASS(vms); uint8_t *smbios_tables, *smbios_anchor; size_t smbios_tables_len, smbios_anchor_len; const char *product =3D "QEMU Virtual Machine"; =20 - if (!lams->fw_cfg) { + if (!vms->fw_cfg) { return; } =20 @@ -493,25 +493,25 @@ static void virt_build_smbios(LoongArchMachineState *= lams) &smbios_anchor, &smbios_anchor_len, &error_fatal); =20 if (smbios_anchor) { - fw_cfg_add_file(lams->fw_cfg, "etc/smbios/smbios-tables", + fw_cfg_add_file(vms->fw_cfg, "etc/smbios/smbios-tables", smbios_tables, smbios_tables_len); - fw_cfg_add_file(lams->fw_cfg, "etc/smbios/smbios-anchor", + fw_cfg_add_file(vms->fw_cfg, "etc/smbios/smbios-anchor", smbios_anchor, smbios_anchor_len); } } =20 static void virt_machine_done(Notifier *notifier, void *data) { - LoongArchMachineState *lams =3D container_of(notifier, - LoongArchMachineState, machine_don= e); - virt_build_smbios(lams); - loongarch_acpi_setup(lams); + VirtMachineState *vms =3D container_of(notifier, + VirtMachineState, machine_done); + virt_build_smbios(vms); + virt_acpi_setup(vms); } =20 static void virt_powerdown_req(Notifier *notifier, void *opaque) { - LoongArchMachineState *s =3D container_of(notifier, - LoongArchMachineState, powerdown_notifi= er); + VirtMachineState *s =3D container_of(notifier, + VirtMachineState, powerdown_notifier); =20 acpi_send_event(s->acpi_ged, ACPI_POWER_DOWN_STATUS); } @@ -535,10 +535,10 @@ static void memmap_add_entry(uint64_t address, uint64= _t length, uint32_t type) memmap_entries++; } =20 -static DeviceState *create_acpi_ged(DeviceState *pch_pic, LoongArchMachine= State *lams) +static DeviceState *create_acpi_ged(DeviceState *pch_pic, VirtMachineState= *vms) { DeviceState *dev; - MachineState *ms =3D MACHINE(lams); + MachineState *ms =3D MACHINE(vms); uint32_t event =3D ACPI_GED_PWR_DOWN_EVT; =20 if (ms->ram_slots) { @@ -585,12 +585,12 @@ static DeviceState *create_platform_bus(DeviceState *= pch_pic) return dev; } =20 -static void loongarch_devices_init(DeviceState *pch_pic, - LoongArchMachineState *lams, +static void virt_devices_init(DeviceState *pch_pic, + VirtMachineState *vms, uint32_t *pch_pic_phandle, uint32_t *pch_msi_phandle) { - MachineClass *mc =3D MACHINE_GET_CLASS(lams); + MachineClass *mc =3D MACHINE_GET_CLASS(vms); DeviceState *gpex_dev; SysBusDevice *d; PCIBus *pci_bus; @@ -602,7 +602,7 @@ static void loongarch_devices_init(DeviceState *pch_pic, d =3D SYS_BUS_DEVICE(gpex_dev); sysbus_realize_and_unref(d, &error_fatal); pci_bus =3D PCI_HOST_BRIDGE(gpex_dev)->bus; - lams->pci_bus =3D pci_bus; + vms->pci_bus =3D pci_bus; =20 /* Map only part size_ecam bytes of ECAM space */ ecam_alias =3D g_new0(MemoryRegion, 1); @@ -635,13 +635,13 @@ static void loongarch_devices_init(DeviceState *pch_p= ic, } =20 /* Add pcie node */ - fdt_add_pcie_node(lams, pch_pic_phandle, pch_msi_phandle); + fdt_add_pcie_node(vms, pch_pic_phandle, pch_msi_phandle); =20 serial_mm_init(get_system_memory(), VIRT_UART_BASE, 0, qdev_get_gpio_in(pch_pic, VIRT_UART_IRQ - VIRT_GSI_BASE), 115200, serial_hd(0), DEVICE_LITTLE_ENDIAN); - fdt_add_uart_node(lams, pch_pic_phandle); + fdt_add_uart_node(vms, pch_pic_phandle); =20 /* Network init */ pci_init_nic_devices(pci_bus, mc->default_nic); @@ -654,17 +654,17 @@ static void loongarch_devices_init(DeviceState *pch_p= ic, sysbus_create_simple("ls7a_rtc", VIRT_RTC_REG_BASE, qdev_get_gpio_in(pch_pic, VIRT_RTC_IRQ - VIRT_GSI_BASE)); - fdt_add_rtc_node(lams, pch_pic_phandle); + fdt_add_rtc_node(vms, pch_pic_phandle); =20 /* acpi ged */ - lams->acpi_ged =3D create_acpi_ged(pch_pic, lams); + vms->acpi_ged =3D create_acpi_ged(pch_pic, vms); /* platform bus */ - lams->platform_bus_dev =3D create_platform_bus(pch_pic); + vms->platform_bus_dev =3D create_platform_bus(pch_pic); } =20 -static void loongarch_irq_init(LoongArchMachineState *lams) +static void virt_irq_init(VirtMachineState *vms) { - MachineState *ms =3D MACHINE(lams); + MachineState *ms =3D MACHINE(vms); DeviceState *pch_pic, *pch_msi, *cpudev; DeviceState *ipi, *extioi; SysBusDevice *d; @@ -702,20 +702,20 @@ static void loongarch_irq_init(LoongArchMachineState = *lams) sysbus_realize_and_unref(SYS_BUS_DEVICE(ipi), &error_fatal); =20 /* IPI iocsr memory region */ - memory_region_add_subregion(&lams->system_iocsr, SMP_IPI_MAILBOX, + memory_region_add_subregion(&vms->system_iocsr, SMP_IPI_MAILBOX, sysbus_mmio_get_region(SYS_BUS_DEVICE(ipi), 0)); - memory_region_add_subregion(&lams->system_iocsr, MAIL_SEND_ADDR, + memory_region_add_subregion(&vms->system_iocsr, MAIL_SEND_ADDR, sysbus_mmio_get_region(SYS_BUS_DEVICE(ipi), 1)); =20 /* Add cpu interrupt-controller */ - fdt_add_cpuic_node(lams, &cpuintc_phandle); + fdt_add_cpuic_node(vms, &cpuintc_phandle); =20 for (cpu =3D 0; cpu < ms->smp.cpus; cpu++) { cpu_state =3D qemu_get_cpu(cpu); cpudev =3D DEVICE(cpu_state); lacpu =3D LOONGARCH_CPU(cpu_state); env =3D &(lacpu->env); - env->address_space_iocsr =3D &lams->as_iocsr; + env->address_space_iocsr =3D &vms->as_iocsr; =20 /* connect ipi irq to cpu irq */ qdev_connect_gpio_out(ipi, cpu, qdev_get_gpio_in(cpudev, IRQ_IPI)); @@ -726,7 +726,7 @@ static void loongarch_irq_init(LoongArchMachineState *l= ams) extioi =3D qdev_new(TYPE_LOONGARCH_EXTIOI); qdev_prop_set_uint32(extioi, "num-cpu", ms->smp.cpus); sysbus_realize_and_unref(SYS_BUS_DEVICE(extioi), &error_fatal); - memory_region_add_subregion(&lams->system_iocsr, APIC_BASE, + memory_region_add_subregion(&vms->system_iocsr, APIC_BASE, sysbus_mmio_get_region(SYS_BUS_DEVICE(extioi), 0)); =20 /* @@ -742,7 +742,7 @@ static void loongarch_irq_init(LoongArchMachineState *l= ams) } =20 /* Add Extend I/O Interrupt Controller node */ - fdt_add_eiointc_node(lams, &cpuintc_phandle, &eiointc_phandle); + fdt_add_eiointc_node(vms, &cpuintc_phandle, &eiointc_phandle); =20 pch_pic =3D qdev_new(TYPE_LOONGARCH_PCH_PIC); num =3D VIRT_PCH_PIC_IRQ_NUM; @@ -764,7 +764,7 @@ static void loongarch_irq_init(LoongArchMachineState *l= ams) } =20 /* Add PCH PIC node */ - fdt_add_pch_pic_node(lams, &eiointc_phandle, &pch_pic_phandle); + fdt_add_pch_pic_node(vms, &eiointc_phandle, &pch_pic_phandle); =20 pch_msi =3D qdev_new(TYPE_LOONGARCH_PCH_MSI); start =3D num; @@ -781,30 +781,30 @@ static void loongarch_irq_init(LoongArchMachineState = *lams) } =20 /* Add PCH MSI node */ - fdt_add_pch_msi_node(lams, &eiointc_phandle, &pch_msi_phandle); + fdt_add_pch_msi_node(vms, &eiointc_phandle, &pch_msi_phandle); =20 - loongarch_devices_init(pch_pic, lams, &pch_pic_phandle, &pch_msi_phand= le); + virt_devices_init(pch_pic, vms, &pch_pic_phandle, &pch_msi_phandle); } =20 -static void loongarch_firmware_init(LoongArchMachineState *lams) +static void virt_firmware_init(VirtMachineState *vms) { - char *filename =3D MACHINE(lams)->firmware; + char *filename =3D MACHINE(vms)->firmware; char *bios_name =3D NULL; int bios_size, i; BlockBackend *pflash_blk0; MemoryRegion *mr; =20 - lams->bios_loaded =3D false; + vms->bios_loaded =3D false; =20 /* Map legacy -drive if=3Dpflash to machine properties */ - for (i =3D 0; i < ARRAY_SIZE(lams->flash); i++) { - pflash_cfi01_legacy_drive(lams->flash[i], + for (i =3D 0; i < ARRAY_SIZE(vms->flash); i++) { + pflash_cfi01_legacy_drive(vms->flash[i], drive_get(IF_PFLASH, 0, i)); } =20 - virt_flash_map(lams, get_system_memory()); + virt_flash_map(vms, get_system_memory()); =20 - pflash_blk0 =3D pflash_cfi01_get_blk(lams->flash[0]); + pflash_blk0 =3D pflash_cfi01_get_blk(vms->flash[0]); =20 if (pflash_blk0) { if (filename) { @@ -812,7 +812,7 @@ static void loongarch_firmware_init(LoongArchMachineSta= te *lams) "options at once"); exit(1); } - lams->bios_loaded =3D true; + vms->bios_loaded =3D true; return; } =20 @@ -823,24 +823,24 @@ static void loongarch_firmware_init(LoongArchMachineS= tate *lams) exit(1); } =20 - mr =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(lams->flash[0]), 0); + mr =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(vms->flash[0]), 0); bios_size =3D load_image_mr(bios_name, mr); if (bios_size < 0) { error_report("Could not load ROM image '%s'", bios_name); exit(1); } g_free(bios_name); - lams->bios_loaded =3D true; + vms->bios_loaded =3D true; } } =20 =20 -static void loongarch_qemu_write(void *opaque, hwaddr addr, - uint64_t val, unsigned size) +static void virt_iocsr_misc_write(void *opaque, hwaddr addr, + uint64_t val, unsigned size) { } =20 -static uint64_t loongarch_qemu_read(void *opaque, hwaddr addr, unsigned si= ze) +static uint64_t virt_iocsr_misc_read(void *opaque, hwaddr addr, unsigned s= ize) { switch (addr) { case VERSION_REG: @@ -858,9 +858,9 @@ static uint64_t loongarch_qemu_read(void *opaque, hwadd= r addr, unsigned size) return 0ULL; } =20 -static const MemoryRegionOps loongarch_qemu_ops =3D { - .read =3D loongarch_qemu_read, - .write =3D loongarch_qemu_write, +static const MemoryRegionOps virt_iocsr_misc_ops =3D { + .read =3D virt_iocsr_misc_read, + .write =3D virt_iocsr_misc_write, .endianness =3D DEVICE_LITTLE_ENDIAN, .valid =3D { .min_access_size =3D 4, @@ -872,7 +872,7 @@ static const MemoryRegionOps loongarch_qemu_ops =3D { }, }; =20 -static void loongarch_init(MachineState *machine) +static void virt_init(MachineState *machine) { LoongArchCPU *lacpu; const char *cpu_model =3D machine->cpu_type; @@ -880,8 +880,8 @@ static void loongarch_init(MachineState *machine) ram_addr_t ram_size =3D machine->ram_size; uint64_t highram_size =3D 0, phyAddr =3D 0; MemoryRegion *address_space_mem =3D get_system_memory(); - LoongArchMachineState *lams =3D VIRT_MACHINE(machine); - int nb_numa_nodes =3D machine->numa_state->num_nodes; + VirtMachineState *vms =3D VIRT_MACHINE(machine); + int nb_numa_nodes =3D machine->numa_state->num_nodes ; NodeInfo *numa_info =3D machine->numa_state->nodes; int i; const CPUArchIdList *possible_cpus; @@ -897,16 +897,16 @@ static void loongarch_init(MachineState *machine) error_report("ram_size must be greater than 1G."); exit(1); } - create_fdt(lams); + create_fdt(vms); =20 /* Create IOCSR space */ - memory_region_init_io(&lams->system_iocsr, OBJECT(machine), NULL, + memory_region_init_io(&vms->system_iocsr, OBJECT(machine), NULL, machine, "iocsr", UINT64_MAX); - address_space_init(&lams->as_iocsr, &lams->system_iocsr, "IOCSR"); - memory_region_init_io(&lams->iocsr_mem, OBJECT(machine), - &loongarch_qemu_ops, + address_space_init(&vms->as_iocsr, &vms->system_iocsr, "IOCSR"); + memory_region_init_io(&vms->iocsr_mem, OBJECT(machine), + &virt_iocsr_misc_ops, machine, "iocsr_misc", 0x428); - memory_region_add_subregion(&lams->system_iocsr, 0, &lams->iocsr_mem); + memory_region_add_subregion(&vms->system_iocsr, 0, &vms->iocsr_mem); =20 /* Init CPUs */ possible_cpus =3D mc->possible_cpu_arch_ids(machine); @@ -917,14 +917,14 @@ static void loongarch_init(MachineState *machine) lacpu =3D LOONGARCH_CPU(cpu); lacpu->phy_id =3D machine->possible_cpus->cpus[i].arch_id; } - fdt_add_cpu_nodes(lams); + fdt_add_cpu_nodes(vms); =20 /* Node0 memory */ memmap_add_entry(VIRT_LOWMEM_BASE, VIRT_LOWMEM_SIZE, 1); fdt_add_memory_node(machine, VIRT_LOWMEM_BASE, VIRT_LOWMEM_SIZE, 0); - memory_region_init_alias(&lams->lowmem, NULL, "loongarch.node0.lowram", + memory_region_init_alias(&vms->lowmem, NULL, "loongarch.node0.lowram", machine->ram, offset, VIRT_LOWMEM_SIZE); - memory_region_add_subregion(address_space_mem, phyAddr, &lams->lowmem); + memory_region_add_subregion(address_space_mem, phyAddr, &vms->lowmem); =20 offset +=3D VIRT_LOWMEM_SIZE; if (nb_numa_nodes > 0) { @@ -936,9 +936,9 @@ static void loongarch_init(MachineState *machine) phyAddr =3D VIRT_HIGHMEM_BASE; memmap_add_entry(phyAddr, highram_size, 1); fdt_add_memory_node(machine, phyAddr, highram_size, 0); - memory_region_init_alias(&lams->highmem, NULL, "loongarch.node0.highra= m", + memory_region_init_alias(&vms->highmem, NULL, "loongarch.node0.highram= ", machine->ram, offset, highram_size); - memory_region_add_subregion(address_space_mem, phyAddr, &lams->highmem= ); + memory_region_add_subregion(address_space_mem, phyAddr, &vms->highmem); =20 /* Node1 - Nodemax memory */ offset +=3D highram_size; @@ -979,30 +979,30 @@ static void loongarch_init(MachineState *machine) } =20 /* load the BIOS image. */ - loongarch_firmware_init(lams); + virt_firmware_init(vms); =20 /* fw_cfg init */ - lams->fw_cfg =3D loongarch_fw_cfg_init(ram_size, machine); - rom_set_fw(lams->fw_cfg); - if (lams->fw_cfg !=3D NULL) { - fw_cfg_add_file(lams->fw_cfg, "etc/memmap", + vms->fw_cfg =3D virt_fw_cfg_init(ram_size, machine); + rom_set_fw(vms->fw_cfg); + if (vms->fw_cfg !=3D NULL) { + fw_cfg_add_file(vms->fw_cfg, "etc/memmap", memmap_table, sizeof(struct memmap_entry) * (memmap_entries)); } - fdt_add_fw_cfg_node(lams); - fdt_add_flash_node(lams); + fdt_add_fw_cfg_node(vms); + fdt_add_flash_node(vms); =20 /* Initialize the IO interrupt subsystem */ - loongarch_irq_init(lams); + virt_irq_init(vms); platform_bus_add_all_fdt_nodes(machine->fdt, "/platic", VIRT_PLATFORM_BUS_BASEADDRESS, VIRT_PLATFORM_BUS_SIZE, VIRT_PLATFORM_BUS_IRQ); - lams->machine_done.notify =3D virt_machine_done; - qemu_add_machine_init_done_notifier(&lams->machine_done); + vms->machine_done.notify =3D virt_machine_done; + qemu_add_machine_init_done_notifier(&vms->machine_done); /* connect powerdown request */ - lams->powerdown_notifier.notify =3D virt_powerdown_req; - qemu_register_powerdown_notifier(&lams->powerdown_notifier); + vms->powerdown_notifier.notify =3D virt_powerdown_req; + qemu_register_powerdown_notifier(&vms->powerdown_notifier); =20 /* * Since lowmem region starts from 0 and Linux kernel legacy start add= ress @@ -1011,49 +1011,49 @@ static void loongarch_init(MachineState *machine) * Put the FDT into the memory map as a ROM image: this will ensure * the FDT is copied again upon reset, even if addr points into RAM. */ - qemu_fdt_dumpdtb(machine->fdt, lams->fdt_size); - rom_add_blob_fixed_as("fdt", machine->fdt, lams->fdt_size, FDT_BASE, + qemu_fdt_dumpdtb(machine->fdt, vms->fdt_size); + rom_add_blob_fixed_as("fdt", machine->fdt, vms->fdt_size, FDT_BASE, &address_space_memory); qemu_register_reset_nosnapshotload(qemu_fdt_randomize_seeds, - rom_ptr_for_as(&address_space_memory, FDT_BASE, lams->fdt_size= )); + rom_ptr_for_as(&address_space_memory, FDT_BASE, vms->fdt_size)= ); =20 - lams->bootinfo.ram_size =3D ram_size; - loongarch_load_kernel(machine, &lams->bootinfo); + vms->bootinfo.ram_size =3D ram_size; + loongarch_load_kernel(machine, &vms->bootinfo); } =20 -bool loongarch_is_acpi_enabled(LoongArchMachineState *lams) +bool virt_is_acpi_enabled(VirtMachineState *vms) { - if (lams->acpi =3D=3D ON_OFF_AUTO_OFF) { + if (vms->acpi =3D=3D ON_OFF_AUTO_OFF) { return false; } return true; } =20 -static void loongarch_get_acpi(Object *obj, Visitor *v, const char *name, +static void virt_get_acpi(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - LoongArchMachineState *lams =3D VIRT_MACHINE(obj); - OnOffAuto acpi =3D lams->acpi; + VirtMachineState *vms =3D VIRT_MACHINE(obj); + OnOffAuto acpi =3D vms->acpi; =20 visit_type_OnOffAuto(v, name, &acpi, errp); } =20 -static void loongarch_set_acpi(Object *obj, Visitor *v, const char *name, +static void virt_set_acpi(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - LoongArchMachineState *lams =3D VIRT_MACHINE(obj); + VirtMachineState *vms =3D VIRT_MACHINE(obj); =20 - visit_type_OnOffAuto(v, name, &lams->acpi, errp); + visit_type_OnOffAuto(v, name, &vms->acpi, errp); } =20 -static void loongarch_machine_initfn(Object *obj) +static void virt_machine_initfn(Object *obj) { - LoongArchMachineState *lams =3D VIRT_MACHINE(obj); + VirtMachineState *vms =3D VIRT_MACHINE(obj); =20 - lams->acpi =3D ON_OFF_AUTO_AUTO; - lams->oem_id =3D g_strndup(ACPI_BUILD_APPNAME6, 6); - lams->oem_table_id =3D g_strndup(ACPI_BUILD_APPNAME8, 8); - virt_flash_create(lams); + vms->acpi =3D ON_OFF_AUTO_AUTO; + vms->oem_id =3D g_strndup(ACPI_BUILD_APPNAME6, 6); + vms->oem_table_id =3D g_strndup(ACPI_BUILD_APPNAME8, 8); + virt_flash_create(vms); } =20 static bool memhp_type_supported(DeviceState *dev) @@ -1080,10 +1080,10 @@ static void virt_machine_device_pre_plug(HotplugHan= dler *hotplug_dev, static void virt_mem_unplug_request(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - LoongArchMachineState *lams =3D VIRT_MACHINE(hotplug_dev); + VirtMachineState *vms =3D VIRT_MACHINE(hotplug_dev); =20 /* the acpi ged is always exist */ - hotplug_handler_unplug_request(HOTPLUG_HANDLER(lams->acpi_ged), dev, + hotplug_handler_unplug_request(HOTPLUG_HANDLER(vms->acpi_ged), dev, errp); } =20 @@ -1098,10 +1098,10 @@ static void virt_machine_device_unplug_request(Hotp= lugHandler *hotplug_dev, static void virt_mem_unplug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - LoongArchMachineState *lams =3D VIRT_MACHINE(hotplug_dev); + VirtMachineState *vms =3D VIRT_MACHINE(hotplug_dev); =20 - hotplug_handler_unplug(HOTPLUG_HANDLER(lams->acpi_ged), dev, errp); - pc_dimm_unplug(PC_DIMM(dev), MACHINE(lams)); + hotplug_handler_unplug(HOTPLUG_HANDLER(vms->acpi_ged), dev, errp); + pc_dimm_unplug(PC_DIMM(dev), MACHINE(vms)); qdev_unrealize(dev); } =20 @@ -1116,22 +1116,22 @@ static void virt_machine_device_unplug(HotplugHandl= er *hotplug_dev, static void virt_mem_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - LoongArchMachineState *lams =3D VIRT_MACHINE(hotplug_dev); + VirtMachineState *vms =3D VIRT_MACHINE(hotplug_dev); =20 - pc_dimm_plug(PC_DIMM(dev), MACHINE(lams)); - hotplug_handler_plug(HOTPLUG_HANDLER(lams->acpi_ged), + pc_dimm_plug(PC_DIMM(dev), MACHINE(vms)); + hotplug_handler_plug(HOTPLUG_HANDLER(vms->acpi_ged), dev, &error_abort); } =20 -static void loongarch_machine_device_plug_cb(HotplugHandler *hotplug_dev, +static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - LoongArchMachineState *lams =3D VIRT_MACHINE(hotplug_dev); - MachineClass *mc =3D MACHINE_GET_CLASS(lams); + VirtMachineState *vms =3D VIRT_MACHINE(hotplug_dev); + MachineClass *mc =3D MACHINE_GET_CLASS(vms); =20 if (device_is_dynamic_sysbus(mc, dev)) { - if (lams->platform_bus_dev) { - platform_bus_link_device(PLATFORM_BUS_DEVICE(lams->platform_bu= s_dev), + if (vms->platform_bus_dev) { + platform_bus_link_device(PLATFORM_BUS_DEVICE(vms->platform_bus= _dev), SYS_BUS_DEVICE(dev)); } } else if (memhp_type_supported(dev)) { @@ -1203,12 +1203,12 @@ static int64_t virt_get_default_cpu_node_id(const M= achineState *ms, int idx) return nidx; } =20 -static void loongarch_class_init(ObjectClass *oc, void *data) +static void virt_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(oc); =20 - mc->init =3D loongarch_init; + mc->init =3D virt_init; mc->default_ram_size =3D 1 * GiB; mc->default_cpu_type =3D LOONGARCH_CPU_TYPE_NAME("la464"); mc->default_ram_id =3D "loongarch.ram"; @@ -1226,14 +1226,13 @@ static void loongarch_class_init(ObjectClass *oc, v= oid *data) mc->auto_enable_numa_with_memdev =3D true; mc->get_hotplug_handler =3D virt_machine_get_hotplug_handler; mc->default_nic =3D "virtio-net-pci"; - hc->plug =3D loongarch_machine_device_plug_cb; + hc->plug =3D virt_machine_device_plug_cb; hc->pre_plug =3D virt_machine_device_pre_plug; hc->unplug_request =3D virt_machine_device_unplug_request; hc->unplug =3D virt_machine_device_unplug; =20 object_class_property_add(oc, "acpi", "OnOffAuto", - loongarch_get_acpi, loongarch_set_acpi, - NULL, NULL); + virt_get_acpi, virt_set_acpi, NULL, NULL); object_class_property_set_description(oc, "acpi", "Enable ACPI"); machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); @@ -1242,13 +1241,13 @@ static void loongarch_class_init(ObjectClass *oc, v= oid *data) #endif } =20 -static const TypeInfo loongarch_machine_types[] =3D { +static const TypeInfo virt_machine_types[] =3D { { .name =3D TYPE_VIRT_MACHINE, .parent =3D TYPE_MACHINE, - .instance_size =3D sizeof(LoongArchMachineState), - .class_init =3D loongarch_class_init, - .instance_init =3D loongarch_machine_initfn, + .instance_size =3D sizeof(VirtMachineState), + .class_init =3D virt_class_init, + .instance_init =3D virt_machine_initfn, .interfaces =3D (InterfaceInfo[]) { { TYPE_HOTPLUG_HANDLER }, { } @@ -1256,4 +1255,4 @@ static const TypeInfo loongarch_machine_types[] =3D { } }; =20 -DEFINE_TYPES(loongarch_machine_types) +DEFINE_TYPES(virt_machine_types) diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h index 5ea2f0370d..b86312b9ae 100644 --- a/include/hw/loongarch/virt.h +++ b/include/hw/loongarch/virt.h @@ -47,7 +47,7 @@ struct memmap_entry { uint32_t reserved; }; =20 -struct LoongArchMachineState { +struct VirtMachineState { /*< private >*/ MachineState parent_obj; =20 @@ -74,7 +74,7 @@ struct LoongArchMachineState { }; =20 #define TYPE_VIRT_MACHINE MACHINE_TYPE_NAME("virt") -OBJECT_DECLARE_SIMPLE_TYPE(LoongArchMachineState, VIRT_MACHINE) -bool loongarch_is_acpi_enabled(LoongArchMachineState *lams); -void loongarch_acpi_setup(LoongArchMachineState *lams); +OBJECT_DECLARE_SIMPLE_TYPE(VirtMachineState, VIRT_MACHINE) +bool virt_is_acpi_enabled(VirtMachineState *vms); +void virt_acpi_setup(VirtMachineState *vms); #endif --=20 2.39.3