From nobody Mon Nov 25 14:59:12 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 1714964643344900.094390089888; Sun, 5 May 2024 20:04:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3ocO-00075A-GS; Sun, 05 May 2024 23:02:20 -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 1s3ocM-00074U-2D for qemu-devel@nongnu.org; Sun, 05 May 2024 23:02:18 -0400 Received: from mail.loongson.cn ([114.242.206.163]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3ocI-0008GQ-07 for qemu-devel@nongnu.org; Sun, 05 May 2024 23:02:17 -0400 Received: from loongson.cn (unknown [10.2.5.213]) by gateway (Coremail) with SMTP id _____8BxnuswSDhmOuIHAA--.21261S3; Mon, 06 May 2024 11:02:08 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by localhost.localdomain (Coremail) with SMTP id AQAAf8DxvlcuSDhmFvwRAA--.31503S3; Mon, 06 May 2024 11:02:07 +0800 (CST) From: Bibo Mao To: Song Gao , Peter Xu , Fabiano Rosas , Laurent Vivier , Thomas Huth Cc: qemu-devel@nongnu.org Subject: [PATCH v3 1/5] hw/loongarch: Rename LOONGARCH_MACHINE with VIRT_MACHINE Date: Mon, 6 May 2024 11:02:02 +0800 Message-Id: <20240506030206.2119832-2-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--.31503S3 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: 1714964643916100002 Content-Type: text/plain; charset="utf-8" On LoongArch system, there is only virt machine type now, name LOONGARCH_MACHINE is confused, rename it with VIRT_MACHINE. Machine name about Other real hw boards can be added in future. Signed-off-by: Bibo Mao --- hw/loongarch/acpi-build.c | 8 ++++---- hw/loongarch/boot.c | 2 +- hw/loongarch/virt.c | 19 +++++++++---------- include/hw/loongarch/virt.h | 4 ++-- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c index e5ab1080af..72322cdb1e 100644 --- a/hw/loongarch/acpi-build.c +++ b/hw/loongarch/acpi-build.c @@ -167,7 +167,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, Mach= ineState *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 LOONGARCH_MACHINE(machine); + LoongArchMachineState *lams =3D VIRT_MACHINE(machine); MachineClass *mc =3D MACHINE_GET_CLASS(lams); 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, @@ -279,7 +279,7 @@ static void build_la_ged_aml(Aml *dsdt, MachineState *machine) { uint32_t event; - LoongArchMachineState *lams =3D LOONGARCH_MACHINE(machine); + LoongArchMachineState *lams =3D VIRT_MACHINE(machine); =20 build_ged_aml(dsdt, "\\_SB."GED_DEVICE, HOTPLUG_HANDLER(lams->acpi_ged), @@ -391,7 +391,7 @@ static void build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine) { Aml *dsdt, *scope, *pkg; - LoongArchMachineState *lams =3D LOONGARCH_MACHINE(machine); + 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 }; =20 @@ -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 LOONGARCH_MACHINE(machine); + LoongArchMachineState *lams =3D VIRT_MACHINE(machine); GArray *table_offsets; AcpiFadtData fadt_data; unsigned facs, rsdt, dsdt; diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c index 7d1630b2e7..e46c70b1b3 100644 --- a/hw/loongarch/boot.c +++ b/hw/loongarch/boot.c @@ -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 LOONGARCH_MACHINE(ms); + LoongArchMachineState *lams =3D VIRT_MACHINE(ms); int i; =20 /* register reset function */ diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index c0999878df..e343974b48 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -880,7 +880,7 @@ 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 LOONGARCH_MACHINE(machine); + LoongArchMachineState *lams =3D VIRT_MACHINE(machine); int nb_numa_nodes =3D machine->numa_state->num_nodes; NodeInfo *numa_info =3D machine->numa_state->nodes; int i; @@ -1032,7 +1032,7 @@ bool loongarch_is_acpi_enabled(LoongArchMachineState = *lams) static void loongarch_get_acpi(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - LoongArchMachineState *lams =3D LOONGARCH_MACHINE(obj); + LoongArchMachineState *lams =3D VIRT_MACHINE(obj); OnOffAuto acpi =3D lams->acpi; =20 visit_type_OnOffAuto(v, name, &acpi, errp); @@ -1041,14 +1041,14 @@ static void loongarch_get_acpi(Object *obj, Visitor= *v, const char *name, static void loongarch_set_acpi(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - LoongArchMachineState *lams =3D LOONGARCH_MACHINE(obj); + LoongArchMachineState *lams =3D VIRT_MACHINE(obj); =20 visit_type_OnOffAuto(v, name, &lams->acpi, errp); } =20 static void loongarch_machine_initfn(Object *obj) { - LoongArchMachineState *lams =3D LOONGARCH_MACHINE(obj); + LoongArchMachineState *lams =3D VIRT_MACHINE(obj); =20 lams->acpi =3D ON_OFF_AUTO_AUTO; lams->oem_id =3D g_strndup(ACPI_BUILD_APPNAME6, 6); @@ -1080,7 +1080,7 @@ static void virt_machine_device_pre_plug(HotplugHandl= er *hotplug_dev, static void virt_mem_unplug_request(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - LoongArchMachineState *lams =3D LOONGARCH_MACHINE(hotplug_dev); + LoongArchMachineState *lams =3D VIRT_MACHINE(hotplug_dev); =20 /* the acpi ged is always exist */ hotplug_handler_unplug_request(HOTPLUG_HANDLER(lams->acpi_ged), dev, @@ -1098,7 +1098,7 @@ static void virt_machine_device_unplug_request(Hotplu= gHandler *hotplug_dev, static void virt_mem_unplug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - LoongArchMachineState *lams =3D LOONGARCH_MACHINE(hotplug_dev); + LoongArchMachineState *lams =3D VIRT_MACHINE(hotplug_dev); =20 hotplug_handler_unplug(HOTPLUG_HANDLER(lams->acpi_ged), dev, errp); pc_dimm_unplug(PC_DIMM(dev), MACHINE(lams)); @@ -1116,7 +1116,7 @@ static void virt_machine_device_unplug(HotplugHandler= *hotplug_dev, static void virt_mem_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - LoongArchMachineState *lams =3D LOONGARCH_MACHINE(hotplug_dev); + LoongArchMachineState *lams =3D VIRT_MACHINE(hotplug_dev); =20 pc_dimm_plug(PC_DIMM(dev), MACHINE(lams)); hotplug_handler_plug(HOTPLUG_HANDLER(lams->acpi_ged), @@ -1126,7 +1126,7 @@ static void virt_mem_plug(HotplugHandler *hotplug_dev, static void loongarch_machine_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - LoongArchMachineState *lams =3D LOONGARCH_MACHINE(hotplug_dev); + LoongArchMachineState *lams =3D VIRT_MACHINE(hotplug_dev); MachineClass *mc =3D MACHINE_GET_CLASS(lams); =20 if (device_is_dynamic_sysbus(mc, dev)) { @@ -1208,7 +1208,6 @@ static void loongarch_class_init(ObjectClass *oc, voi= d *data) MachineClass *mc =3D MACHINE_CLASS(oc); HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(oc); =20 - mc->desc =3D "Loongson-3A5000 LS7A1000 machine"; mc->init =3D loongarch_init; mc->default_ram_size =3D 1 * GiB; mc->default_cpu_type =3D LOONGARCH_CPU_TYPE_NAME("la464"); @@ -1245,7 +1244,7 @@ static void loongarch_class_init(ObjectClass *oc, voi= d *data) =20 static const TypeInfo loongarch_machine_types[] =3D { { - .name =3D TYPE_LOONGARCH_MACHINE, + .name =3D TYPE_VIRT_MACHINE, .parent =3D TYPE_MACHINE, .instance_size =3D sizeof(LoongArchMachineState), .class_init =3D loongarch_class_init, diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h index 4e14bf6060..5ea2f0370d 100644 --- a/include/hw/loongarch/virt.h +++ b/include/hw/loongarch/virt.h @@ -73,8 +73,8 @@ struct LoongArchMachineState { struct loongarch_boot_info bootinfo; }; =20 -#define TYPE_LOONGARCH_MACHINE MACHINE_TYPE_NAME("virt") -OBJECT_DECLARE_SIMPLE_TYPE(LoongArchMachineState, LOONGARCH_MACHINE) +#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); #endif --=20 2.39.3