motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 17:23:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/loongarch: Rename LOONGARCH_MACHINE with LOONGARCH_VIRT_MACHINE

Browse source 
On LoongArch system, there is only virt machine type now, name
LOONGARCH_MACHINE is confused, rename it with LOONGARCH_VIRT_MACHINE.
Machine name about Other real hw boards can be added in future.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240508031110.2507477-2-maobibo@loongson.cn>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Bibo Mao 2024-05-08 11:11:06 +08:00 • committed by Philippe Mathieu-Daudé
parent 54c52ec719
commit df0d93c1e2
4 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hw/loongarch/acpi-build.c
View file

@ -167,7 +167,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
int i, arch_id, node_id; int i, arch_id, node_id;
uint64_t mem_len, mem_base; uint64_t mem_len, mem_base;
int nb_numa_nodes = machine->numa_state->num_nodes; int nb_numa_nodes = machine->numa_state->num_nodes;
LoongArchMachineState *lams = LOONGARCH_MACHINE(machine); LoongArchMachineState *lams = LOONGARCH_VIRT_MACHINE(machine);
MachineClass *mc = MACHINE_GET_CLASS(lams); MachineClass *mc = MACHINE_GET_CLASS(lams);
const CPUArchIdList *arch_ids = mc->possible_cpu_arch_ids(machine); const CPUArchIdList *arch_ids = mc->possible_cpu_arch_ids(machine);
AcpiTable table = { .sig = "SRAT", .rev = 1, .oem_id = lams->oem_id, AcpiTable table = { .sig = "SRAT", .rev = 1, .oem_id = lams->oem_id,
@ -279,7 +279,7 @@ static void
build_la_ged_aml(Aml *dsdt, MachineState *machine) build_la_ged_aml(Aml *dsdt, MachineState *machine)
{ {
uint32_t event; uint32_t event;
LoongArchMachineState *lams = LOONGARCH_MACHINE(machine); LoongArchMachineState *lams = LOONGARCH_VIRT_MACHINE(machine);
build_ged_aml(dsdt, "\\_SB."GED_DEVICE, build_ged_aml(dsdt, "\\_SB."GED_DEVICE,
HOTPLUG_HANDLER(lams->acpi_ged), HOTPLUG_HANDLER(lams->acpi_ged),
@ -391,7 +391,7 @@ static void
build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine) build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine)
{ {
Aml *dsdt, *scope, *pkg; Aml *dsdt, *scope, *pkg;
LoongArchMachineState *lams = LOONGARCH_MACHINE(machine); LoongArchMachineState *lams = LOONGARCH_VIRT_MACHINE(machine);
AcpiTable table = { .sig = "DSDT", .rev = 1, .oem_id = lams->oem_id, AcpiTable table = { .sig = "DSDT", .rev = 1, .oem_id = lams->oem_id,
.oem_table_id = lams->oem_table_id }; .oem_table_id = lams->oem_table_id };
@ -421,7 +421,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine)
static void acpi_build(AcpiBuildTables *tables, MachineState *machine) static void acpi_build(AcpiBuildTables *tables, MachineState *machine)
{ {
LoongArchMachineState *lams = LOONGARCH_MACHINE(machine); LoongArchMachineState *lams = LOONGARCH_VIRT_MACHINE(machine);
GArray *table_offsets; GArray *table_offsets;
AcpiFadtData fadt_data; AcpiFadtData fadt_data;
unsigned facs, rsdt, dsdt; unsigned facs, rsdt, dsdt;

2
hw/loongarch/boot.c
View file

@ -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) void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info)
{ {
LoongArchMachineState *lams = LOONGARCH_MACHINE(ms); LoongArchMachineState *lams = LOONGARCH_VIRT_MACHINE(ms);
int i; int i;
/* register reset function */ /* register reset function */

19
hw/loongarch/virt.c
View file

@ -877,7 +877,7 @@ static void loongarch_init(MachineState *machine)
ram_addr_t ram_size = machine->ram_size; ram_addr_t ram_size = machine->ram_size;
uint64_t highram_size = 0, phyAddr = 0; uint64_t highram_size = 0, phyAddr = 0;
MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *address_space_mem = get_system_memory();
LoongArchMachineState *lams = LOONGARCH_MACHINE(machine); LoongArchMachineState *lams = LOONGARCH_VIRT_MACHINE(machine);
int nb_numa_nodes = machine->numa_state->num_nodes; int nb_numa_nodes = machine->numa_state->num_nodes;
NodeInfo *numa_info = machine->numa_state->nodes; NodeInfo *numa_info = machine->numa_state->nodes;
int i; int i;
@ -1028,7 +1028,7 @@ bool loongarch_is_acpi_enabled(LoongArchMachineState *lams)
static void loongarch_get_acpi(Object *obj, Visitor *v, const char *name, static void loongarch_get_acpi(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp) void *opaque, Error **errp)
{ {
LoongArchMachineState *lams = LOONGARCH_MACHINE(obj); LoongArchMachineState *lams = LOONGARCH_VIRT_MACHINE(obj);
OnOffAuto acpi = lams->acpi; OnOffAuto acpi = lams->acpi;
visit_type_OnOffAuto(v, name, &acpi, errp); visit_type_OnOffAuto(v, name, &acpi, errp);
@ -1037,14 +1037,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, static void loongarch_set_acpi(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp) void *opaque, Error **errp)
{ {
LoongArchMachineState *lams = LOONGARCH_MACHINE(obj); LoongArchMachineState *lams = LOONGARCH_VIRT_MACHINE(obj);
visit_type_OnOffAuto(v, name, &lams->acpi, errp); visit_type_OnOffAuto(v, name, &lams->acpi, errp);
} }
static void loongarch_machine_initfn(Object *obj) static void loongarch_machine_initfn(Object *obj)
{ {
LoongArchMachineState *lams = LOONGARCH_MACHINE(obj); LoongArchMachineState *lams = LOONGARCH_VIRT_MACHINE(obj);
lams->acpi = ON_OFF_AUTO_AUTO; lams->acpi = ON_OFF_AUTO_AUTO;
lams->oem_id = g_strndup(ACPI_BUILD_APPNAME6, 6); lams->oem_id = g_strndup(ACPI_BUILD_APPNAME6, 6);
@ -1076,7 +1076,7 @@ static void virt_machine_device_pre_plug(HotplugHandler *hotplug_dev,
static void virt_mem_unplug_request(HotplugHandler *hotplug_dev, static void virt_mem_unplug_request(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp) DeviceState *dev, Error **errp)
{ {
LoongArchMachineState *lams = LOONGARCH_MACHINE(hotplug_dev); LoongArchMachineState *lams = LOONGARCH_VIRT_MACHINE(hotplug_dev);
/* the acpi ged is always exist */ /* the acpi ged is always exist */
hotplug_handler_unplug_request(HOTPLUG_HANDLER(lams->acpi_ged), dev, hotplug_handler_unplug_request(HOTPLUG_HANDLER(lams->acpi_ged), dev,
@ -1094,7 +1094,7 @@ static void virt_machine_device_unplug_request(HotplugHandler *hotplug_dev,
static void virt_mem_unplug(HotplugHandler *hotplug_dev, static void virt_mem_unplug(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp) DeviceState *dev, Error **errp)
{ {
LoongArchMachineState *lams = LOONGARCH_MACHINE(hotplug_dev); LoongArchMachineState *lams = LOONGARCH_VIRT_MACHINE(hotplug_dev);
hotplug_handler_unplug(HOTPLUG_HANDLER(lams->acpi_ged), dev, errp); hotplug_handler_unplug(HOTPLUG_HANDLER(lams->acpi_ged), dev, errp);
pc_dimm_unplug(PC_DIMM(dev), MACHINE(lams)); pc_dimm_unplug(PC_DIMM(dev), MACHINE(lams));
@ -1112,7 +1112,7 @@ static void virt_machine_device_unplug(HotplugHandler *hotplug_dev,
static void virt_mem_plug(HotplugHandler *hotplug_dev, static void virt_mem_plug(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp) DeviceState *dev, Error **errp)
{ {
LoongArchMachineState *lams = LOONGARCH_MACHINE(hotplug_dev); LoongArchMachineState *lams = LOONGARCH_VIRT_MACHINE(hotplug_dev);
pc_dimm_plug(PC_DIMM(dev), MACHINE(lams)); pc_dimm_plug(PC_DIMM(dev), MACHINE(lams));
hotplug_handler_plug(HOTPLUG_HANDLER(lams->acpi_ged), hotplug_handler_plug(HOTPLUG_HANDLER(lams->acpi_ged),
@ -1122,7 +1122,7 @@ static void virt_mem_plug(HotplugHandler *hotplug_dev,
static void loongarch_machine_device_plug_cb(HotplugHandler *hotplug_dev, static void loongarch_machine_device_plug_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp) DeviceState *dev, Error **errp)
{ {
LoongArchMachineState *lams = LOONGARCH_MACHINE(hotplug_dev); LoongArchMachineState *lams = LOONGARCH_VIRT_MACHINE(hotplug_dev);
MachineClass *mc = MACHINE_GET_CLASS(lams); MachineClass *mc = MACHINE_GET_CLASS(lams);
if (device_is_dynamic_sysbus(mc, dev)) { if (device_is_dynamic_sysbus(mc, dev)) {
@ -1204,7 +1204,6 @@ static void loongarch_class_init(ObjectClass *oc, void *data)
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
mc->desc = "Loongson-3A5000 LS7A1000 machine";
mc->init = loongarch_init; mc->init = loongarch_init;
mc->default_ram_size = 1 * GiB; mc->default_ram_size = 1 * GiB;
mc->default_cpu_type = LOONGARCH_CPU_TYPE_NAME("la464"); mc->default_cpu_type = LOONGARCH_CPU_TYPE_NAME("la464");
@ -1241,7 +1240,7 @@ static void loongarch_class_init(ObjectClass *oc, void *data)
static const TypeInfo loongarch_machine_types[] = { static const TypeInfo loongarch_machine_types[] = {
{ {
.name = TYPE_LOONGARCH_MACHINE, .name = TYPE_LOONGARCH_VIRT_MACHINE,
.parent = TYPE_MACHINE, .parent = TYPE_MACHINE,
.instance_size = sizeof(LoongArchMachineState), .instance_size = sizeof(LoongArchMachineState),
.class_init = loongarch_class_init, .class_init = loongarch_class_init,

4
include/hw/loongarch/virt.h
View file

@ -63,8 +63,8 @@ struct LoongArchMachineState {
struct loongarch_boot_info bootinfo; struct loongarch_boot_info bootinfo;
}; };
#define TYPE_LOONGARCH_MACHINE MACHINE_TYPE_NAME("virt") #define TYPE_LOONGARCH_VIRT_MACHINE MACHINE_TYPE_NAME("virt")
OBJECT_DECLARE_SIMPLE_TYPE(LoongArchMachineState, LOONGARCH_MACHINE) OBJECT_DECLARE_SIMPLE_TYPE(LoongArchMachineState, LOONGARCH_VIRT_MACHINE)
bool loongarch_is_acpi_enabled(LoongArchMachineState *lams); bool loongarch_is_acpi_enabled(LoongArchMachineState *lams);
void loongarch_acpi_setup(LoongArchMachineState *lams); void loongarch_acpi_setup(LoongArchMachineState *lams);
#endif #endif