ppc: pnv: normalize core/chip type names
typically for cpus/core type names following convention is used new_type_prefix-superclass_typename make PNV core/chip to follow common convention. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Acked-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
4a12c699d3
commit
7fd544d8a7
|
@ -608,7 +608,7 @@ static void ppc_powernv_init(MachineState *machine)
|
||||||
|
|
||||||
/* Create the processor chips */
|
/* Create the processor chips */
|
||||||
i = strlen(machine->cpu_type) - strlen(POWERPC_CPU_TYPE_SUFFIX);
|
i = strlen(machine->cpu_type) - strlen(POWERPC_CPU_TYPE_SUFFIX);
|
||||||
chip_typename = g_strdup_printf(TYPE_PNV_CHIP "-%.*s",
|
chip_typename = g_strdup_printf(PNV_CHIP_TYPE_NAME("%.*s"),
|
||||||
i, machine->cpu_type);
|
i, machine->cpu_type);
|
||||||
if (!object_class_by_name(chip_typename)) {
|
if (!object_class_by_name(chip_typename)) {
|
||||||
error_report("invalid CPU model '%.*s' for %s machine",
|
error_report("invalid CPU model '%.*s' for %s machine",
|
||||||
|
|
|
@ -252,5 +252,5 @@ type_init(pnv_core_register_types)
|
||||||
|
|
||||||
char *pnv_core_typename(const char *model)
|
char *pnv_core_typename(const char *model)
|
||||||
{
|
{
|
||||||
return g_strdup_printf(TYPE_PNV_CORE "-%s", model);
|
return g_strdup_printf(PNV_CORE_TYPE_NAME("%s"), model);
|
||||||
}
|
}
|
||||||
|
|
|
@ -80,19 +80,22 @@ typedef struct PnvChipClass {
|
||||||
uint32_t (*core_pir)(PnvChip *chip, uint32_t core_id);
|
uint32_t (*core_pir)(PnvChip *chip, uint32_t core_id);
|
||||||
} PnvChipClass;
|
} PnvChipClass;
|
||||||
|
|
||||||
#define TYPE_PNV_CHIP_POWER8E TYPE_PNV_CHIP "-power8e_v2.1"
|
#define PNV_CHIP_TYPE_SUFFIX "-" TYPE_PNV_CHIP
|
||||||
|
#define PNV_CHIP_TYPE_NAME(cpu_model) cpu_model PNV_CHIP_TYPE_SUFFIX
|
||||||
|
|
||||||
|
#define TYPE_PNV_CHIP_POWER8E PNV_CHIP_TYPE_NAME("power8e_v2.1")
|
||||||
#define PNV_CHIP_POWER8E(obj) \
|
#define PNV_CHIP_POWER8E(obj) \
|
||||||
OBJECT_CHECK(PnvChip, (obj), TYPE_PNV_CHIP_POWER8E)
|
OBJECT_CHECK(PnvChip, (obj), TYPE_PNV_CHIP_POWER8E)
|
||||||
|
|
||||||
#define TYPE_PNV_CHIP_POWER8 TYPE_PNV_CHIP "-power8_v2.0"
|
#define TYPE_PNV_CHIP_POWER8 PNV_CHIP_TYPE_NAME("power8_v2.0")
|
||||||
#define PNV_CHIP_POWER8(obj) \
|
#define PNV_CHIP_POWER8(obj) \
|
||||||
OBJECT_CHECK(PnvChip, (obj), TYPE_PNV_CHIP_POWER8)
|
OBJECT_CHECK(PnvChip, (obj), TYPE_PNV_CHIP_POWER8)
|
||||||
|
|
||||||
#define TYPE_PNV_CHIP_POWER8NVL TYPE_PNV_CHIP "-power8nvl_v1.0"
|
#define TYPE_PNV_CHIP_POWER8NVL PNV_CHIP_TYPE_NAME("power8nvl_v1.0")
|
||||||
#define PNV_CHIP_POWER8NVL(obj) \
|
#define PNV_CHIP_POWER8NVL(obj) \
|
||||||
OBJECT_CHECK(PnvChip, (obj), TYPE_PNV_CHIP_POWER8NVL)
|
OBJECT_CHECK(PnvChip, (obj), TYPE_PNV_CHIP_POWER8NVL)
|
||||||
|
|
||||||
#define TYPE_PNV_CHIP_POWER9 TYPE_PNV_CHIP "-power9_v2.0"
|
#define TYPE_PNV_CHIP_POWER9 PNV_CHIP_TYPE_NAME("power9_v2.0")
|
||||||
#define PNV_CHIP_POWER9(obj) \
|
#define PNV_CHIP_POWER9(obj) \
|
||||||
OBJECT_CHECK(PnvChip, (obj), TYPE_PNV_CHIP_POWER9)
|
OBJECT_CHECK(PnvChip, (obj), TYPE_PNV_CHIP_POWER9)
|
||||||
|
|
||||||
|
|
|
@ -45,6 +45,8 @@ typedef struct PnvCoreClass {
|
||||||
ObjectClass *cpu_oc;
|
ObjectClass *cpu_oc;
|
||||||
} PnvCoreClass;
|
} PnvCoreClass;
|
||||||
|
|
||||||
|
#define PNV_CORE_TYPE_SUFFIX "-" TYPE_PNV_CORE
|
||||||
|
#define PNV_CORE_TYPE_NAME(cpu_model) cpu_model PNV_CORE_TYPE_SUFFIX
|
||||||
extern char *pnv_core_typename(const char *model);
|
extern char *pnv_core_typename(const char *model);
|
||||||
|
|
||||||
#endif /* _PPC_PNV_CORE_H */
|
#endif /* _PPC_PNV_CORE_H */
|
||||||
|
|
Loading…
Reference in a new issue