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

ppc/pnv: New powernv10-rainier machine type

Browse source 
Create a new powernv machine type, powernv10-rainier, that
will contain rainier-specific devices.

Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Glenn Miles <milesg@linux.vnet.ibm.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
This commit is contained in:
Glenn Miles 2024-02-05 17:40:15 +10:00 • committed by Nicholas Piggin
parent ff557c272c
commit ab8746683c
1 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

24
hw/ppc/pnv.c
View file

@ -2249,7 +2249,7 @@ static void pnv_machine_power9_class_init(ObjectClass *oc, void *data)
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_PNV_PHB); machine_class_allow_dynamic_sysbus_dev(mc, TYPE_PNV_PHB);
} }
static void pnv_machine_power10_class_init(ObjectClass *oc, void *data) static void pnv_machine_p10_common_class_init(ObjectClass *oc, void *data)
{ {
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
PnvMachineClass *pmc = PNV_MACHINE_CLASS(oc); PnvMachineClass *pmc = PNV_MACHINE_CLASS(oc);
@ -2261,7 +2261,6 @@ static void pnv_machine_power10_class_init(ObjectClass *oc, void *data)
{ TYPE_PNV_PHB_ROOT_PORT, "version", "5" }, { TYPE_PNV_PHB_ROOT_PORT, "version", "5" },
}; };
mc->desc = "IBM PowerNV (Non-Virtualized) POWER10";
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power10_v2.0"); mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power10_v2.0");
compat_props_add(mc->compat_props, phb_compat, G_N_ELEMENTS(phb_compat)); compat_props_add(mc->compat_props, phb_compat, G_N_ELEMENTS(phb_compat));
@ -2276,6 +2275,22 @@ static void pnv_machine_power10_class_init(ObjectClass *oc, void *data)
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_PNV_PHB); machine_class_allow_dynamic_sysbus_dev(mc, TYPE_PNV_PHB);
} }
static void pnv_machine_power10_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
pnv_machine_p10_common_class_init(oc, data);
mc->desc = "IBM PowerNV (Non-Virtualized) POWER10";
}
static void pnv_machine_p10_rainier_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
pnv_machine_p10_common_class_init(oc, data);
mc->desc = "IBM PowerNV (Non-Virtualized) POWER10 Rainier";
}
static bool pnv_machine_get_hb(Object *obj, Error **errp) static bool pnv_machine_get_hb(Object *obj, Error **errp)
{ {
PnvMachineState *pnv = PNV_MACHINE(obj); PnvMachineState *pnv = PNV_MACHINE(obj);
@ -2381,6 +2396,11 @@ static void pnv_machine_class_init(ObjectClass *oc, void *data)
} }
static const TypeInfo types[] = { static const TypeInfo types[] = {
{
.name = MACHINE_TYPE_NAME("powernv10-rainier"),
.parent = MACHINE_TYPE_NAME("powernv10"),
.class_init = pnv_machine_p10_rainier_class_init,
},
{ {
.name = MACHINE_TYPE_NAME("powernv10"), .name = MACHINE_TYPE_NAME("powernv10"),
.parent = TYPE_PNV_MACHINE, .parent = TYPE_PNV_MACHINE,