Commit beba5c0f authored by Igor Mammedov's avatar Igor Mammedov Committed by David Gibson
Browse files

ppc: pnv: consolidate type definitions and batch register them 



Use a new DEFINE_TYPES() helper to simplify type registration

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarCédric Le Goater <clg@kaod.org>
Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 40abf43f

hw/ppc/pnv.c

+34 −58
Original line number Diff line number Diff line
@@ -729,13 +729,6 @@ static void pnv_chip_power8e_class_init(ObjectClass *klass, void *data) 
    dc->desc = "PowerNV Chip POWER8E";

}



static const TypeInfo pnv_chip_power8e_info = {

    .name          = TYPE_PNV_CHIP_POWER8E,

    .parent        = TYPE_PNV_CHIP,

    .instance_size = sizeof(PnvChip),

    .class_init    = pnv_chip_power8e_class_init,

};



static void pnv_chip_power8_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);
@@ -750,13 +743,6 @@ static void pnv_chip_power8_class_init(ObjectClass *klass, void *data) 
    dc->desc = "PowerNV Chip POWER8";

}



static const TypeInfo pnv_chip_power8_info = {

    .name          = TYPE_PNV_CHIP_POWER8,

    .parent        = TYPE_PNV_CHIP,

    .instance_size = sizeof(PnvChip),

    .class_init    = pnv_chip_power8_class_init,

};



static void pnv_chip_power8nvl_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);
@@ -771,13 +757,6 @@ static void pnv_chip_power8nvl_class_init(ObjectClass *klass, void *data) 
    dc->desc = "PowerNV Chip POWER8NVL";

}



static const TypeInfo pnv_chip_power8nvl_info = {

    .name          = TYPE_PNV_CHIP_POWER8NVL,

    .parent        = TYPE_PNV_CHIP,

    .instance_size = sizeof(PnvChip),

    .class_init    = pnv_chip_power8nvl_class_init,

};



static void pnv_chip_power9_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);
@@ -792,13 +771,6 @@ static void pnv_chip_power9_class_init(ObjectClass *klass, void *data) 
    dc->desc = "PowerNV Chip POWER9";

}



static const TypeInfo pnv_chip_power9_info = {

    .name          = TYPE_PNV_CHIP_POWER9,

    .parent        = TYPE_PNV_CHIP,

    .instance_size = sizeof(PnvChip),

    .class_init    = pnv_chip_power9_class_init,

};



static void pnv_chip_core_sanitize(PnvChip *chip, Error **errp)

{

    PnvChipClass *pcc = PNV_CHIP_GET_CLASS(chip);
@@ -1000,15 +972,6 @@ static void pnv_chip_class_init(ObjectClass *klass, void *data) 
    dc->desc = "PowerNV Chip";

}



static const TypeInfo pnv_chip_info = {

    .name          = TYPE_PNV_CHIP,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .class_init    = pnv_chip_class_init,

    .instance_init = pnv_chip_init,

    .class_size    = sizeof(PnvChipClass),

    .abstract      = true,

};



static ICSState *pnv_ics_get(XICSFabric *xi, int irq)

{

    PnvMachineState *pnv = POWERNV_MACHINE(xi);
@@ -1144,7 +1107,15 @@ static void powernv_machine_class_init(ObjectClass *oc, void *data) 
    powernv_machine_class_props_init(oc);

}



static const TypeInfo powernv_machine_info = {

#define DEFINE_PNV_CHIP_TYPE(type, class_initfn) \

    {                                            \

        .name          = type,                   \

        .class_init    = class_initfn,           \

        .parent        = TYPE_PNV_CHIP,          \

    }



static const TypeInfo types[] = {

    {

        .name          = TYPE_POWERNV_MACHINE,

        .parent        = TYPE_MACHINE,

        .instance_size = sizeof(PnvMachineState),
@@ -1155,16 +1126,21 @@ static const TypeInfo powernv_machine_info = { 
            { TYPE_INTERRUPT_STATS_PROVIDER },

            { },

        },

};



static void powernv_machine_register_types(void)

    },

    {

    type_register_static(&powernv_machine_info);

    type_register_static(&pnv_chip_info);

    type_register_static(&pnv_chip_power8e_info);

    type_register_static(&pnv_chip_power8_info);

    type_register_static(&pnv_chip_power8nvl_info);

    type_register_static(&pnv_chip_power9_info);

}

        .name          = TYPE_PNV_CHIP,

        .parent        = TYPE_SYS_BUS_DEVICE,

        .class_init    = pnv_chip_class_init,

        .instance_init = pnv_chip_init,

        .instance_size = sizeof(PnvChip),

        .class_size    = sizeof(PnvChipClass),

        .abstract      = true,

    },

    DEFINE_PNV_CHIP_TYPE(TYPE_PNV_CHIP_POWER9, pnv_chip_power9_class_init),

    DEFINE_PNV_CHIP_TYPE(TYPE_PNV_CHIP_POWER8, pnv_chip_power8_class_init),

    DEFINE_PNV_CHIP_TYPE(TYPE_PNV_CHIP_POWER8E, pnv_chip_power8e_class_init),

    DEFINE_PNV_CHIP_TYPE(TYPE_PNV_CHIP_POWER8NVL,

                         pnv_chip_power8nvl_class_init),

};



type_init(powernv_machine_register_types)
 
DEFINE_TYPES(types)