On Thu, Oct 05, 2017 at 06:24:46PM +0200, Igor Mammedov wrote: > 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 <imamm...@redhat.com>
Acked-by: David Gibson <da...@gibson.dropbear.id.au> > --- > include/hw/ppc/pnv.h | 11 +++++++---- > include/hw/ppc/pnv_core.h | 2 ++ > hw/ppc/pnv.c | 2 +- > hw/ppc/pnv_core.c | 2 +- > 4 files changed, 11 insertions(+), 6 deletions(-) > > diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h > index 2525f7f..d82eee1 100644 > --- a/include/hw/ppc/pnv.h > +++ b/include/hw/ppc/pnv.h > @@ -80,19 +80,22 @@ typedef struct PnvChipClass { > uint32_t (*core_pir)(PnvChip *chip, uint32_t core_id); > } 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) \ > 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) \ > 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) \ > OBJECT_CHECK(PnvChip, (obj), TYPE_PNV_CHIP_POWER8NVL) > > -#define TYPE_PNV_CHIP_POWER9 TYPE_PNV_CHIP "-power9_v1.0" > +#define TYPE_PNV_CHIP_POWER9 PNV_CHIP_TYPE_NAME("power9_v1.0") > #define PNV_CHIP_POWER9(obj) \ > OBJECT_CHECK(PnvChip, (obj), TYPE_PNV_CHIP_POWER9) > > diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h > index 2955a41..3360c4b 100644 > --- a/include/hw/ppc/pnv_core.h > +++ b/include/hw/ppc/pnv_core.h > @@ -45,6 +45,8 @@ typedef struct PnvCoreClass { > ObjectClass *cpu_oc; > } 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); > > #endif /* _PPC_PNV_CORE_H */ > diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c > index 4169837..9c5eb7c 100644 > --- a/hw/ppc/pnv.c > +++ b/hw/ppc/pnv.c > @@ -609,7 +609,7 @@ static void ppc_powernv_init(MachineState *machine) > > /* Create the processor chips */ > 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); > if (!object_class_by_name(chip_typename)) { > error_report("invalid CPU model '%.*s' for %s machine", > diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c > index 44b0b24..b3e3f23 100644 > --- a/hw/ppc/pnv_core.c > +++ b/hw/ppc/pnv_core.c > @@ -252,5 +252,5 @@ type_init(pnv_core_register_types) > > 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); > } -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature