Commit 4f7a47be authored by Cédric Le Goater's avatar Cédric Le Goater Committed by David Gibson
Browse files

ppc/xics: introduce an icp_create() helper 



The sPAPR and the PowerNV core objects create the interrupt presenter
object of the CPUs in a very similar way. Let's provide a common
routine in which we use the presenter 'type' as a child identifier.

Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 3fe4f0fc

hw/intc/xics.c

+21 −0
Original line number Diff line number Diff line
@@ -384,6 +384,27 @@ static const TypeInfo icp_info = { 
    .class_size = sizeof(ICPStateClass),

};



Object *icp_create(Object *cpu, const char *type, XICSFabric *xi, Error **errp)

{

    Error *local_err = NULL;

    Object *obj;



    obj = object_new(type);

    object_property_add_child(cpu, type, obj, &error_abort);

    object_unref(obj);

    object_property_add_const_link(obj, ICP_PROP_XICS, OBJECT(xi),

                                   &error_abort);

    object_property_add_const_link(obj, ICP_PROP_CPU, cpu, &error_abort);

    object_property_set_bool(obj, true, "realized", &local_err);

    if (local_err) {

        object_unparent(obj);

        error_propagate(errp, local_err);

        obj = NULL;

    }



    return obj;

}



/*

 * ICS: Source layer

 */

hw/ppc/pnv_core.c

+1 −9
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ static void pnv_core_realize_child(Object *child, XICSFabric *xi, Error **errp) 
    Error *local_err = NULL;

    CPUState *cs = CPU(child);

    PowerPCCPU *cpu = POWERPC_CPU(cs);

    Object *obj;



    object_property_set_bool(child, true, "realized", &local_err);

    if (local_err) {
@@ -134,13 +133,7 @@ static void pnv_core_realize_child(Object *child, XICSFabric *xi, Error **errp) 
        return;

    }



    obj = object_new(TYPE_PNV_ICP);

    object_property_add_child(child, "icp", obj, NULL);

    object_unref(obj);

    object_property_add_const_link(obj, ICP_PROP_XICS, OBJECT(xi),

                                   &error_abort);

    object_property_add_const_link(obj, ICP_PROP_CPU, child, &error_abort);

    object_property_set_bool(obj, true, "realized", &local_err);

    icp_create(child, TYPE_PNV_ICP, xi, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        return;
@@ -148,7 +141,6 @@ static void pnv_core_realize_child(Object *child, XICSFabric *xi, Error **errp) 


    powernv_cpu_init(cpu, &local_err);

    if (local_err) {

        object_unparent(obj);

        error_propagate(errp, local_err);

        return;

    }

hw/ppc/spapr_cpu_core.c

+2 −11
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ static void spapr_cpu_core_realize_child(Object *child, 
    Error *local_err = NULL;

    CPUState *cs = CPU(child);

    PowerPCCPU *cpu = POWERPC_CPU(cs);

    Object *obj;



    object_property_set_bool(child, true, "realized", &local_err);

    if (local_err) {
@@ -122,21 +121,13 @@ static void spapr_cpu_core_realize_child(Object *child, 
        goto error;

    }



    obj = object_new(spapr->icp_type);

    object_property_add_child(child, "icp", obj, &error_abort);

    object_unref(obj);

    object_property_add_const_link(obj, ICP_PROP_XICS, OBJECT(spapr),

                                   &error_abort);

    object_property_add_const_link(obj, ICP_PROP_CPU, child, &error_abort);

    object_property_set_bool(obj, true, "realized", &local_err);

    icp_create(child, spapr->icp_type, XICS_FABRIC(spapr), &local_err);

    if (local_err) {

        goto free_icp;

        goto error;

    }



    return;



free_icp:

    object_unparent(obj);

error:

    error_propagate(errp, local_err);

}

include/hw/ppc/xics.h

+3 −0
Original line number Diff line number Diff line
@@ -212,4 +212,7 @@ typedef struct sPAPRMachineState sPAPRMachineState; 
int xics_kvm_init(sPAPRMachineState *spapr, Error **errp);

void xics_spapr_init(sPAPRMachineState *spapr);



Object *icp_create(Object *cpu, const char *type, XICSFabric *xi,

                   Error **errp);



#endif /* XICS_H */