@@ -1015,6 +1015,20 @@ static ICPState *pnv_icp_get(XICSFabric *xi, int pir)
return cpu ? ICP(cpu->intc) : NULL;
}
+Object *pnv_icp_create(PnvMachineState *pnv, Object *cpu, Error **errp)
+{
+ Error *local_err = NULL;
+ Object *obj;
+
+ obj = icp_create(cpu, TYPE_PNV_ICP, XICS_FABRIC(pnv), &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return NULL;
+ }
+
+ return obj;
+}
+
static void pnv_pic_print_info(InterruptStatsProvider *obj,
Monitor *mon)
{
@@ -133,7 +133,7 @@ static void pnv_core_realize_child(Object *child, XICSFabric *xi, Error **errp)
return;
}
- cpu->intc = icp_create(child, TYPE_PNV_ICP, xi, &local_err);
+ cpu->intc = pnv_icp_create(PNV_MACHINE(xi), child, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
@@ -191,4 +191,6 @@ void pnv_bmc_powerdown(IPMIBmc *bmc);
(0x0003ffe000000000ull + (uint64_t)PNV_CHIP_INDEX(chip) * \
PNV_PSIHB_FSP_SIZE)
+Object *pnv_icp_create(PnvMachineState *spapr, Object *cpu, Error **errp);
+
#endif /* _PPC_PNV_H */
The type of the interrupt presenter depends on the processor family, POWER8 uses XICS and POWER9 uses XIVE. Provide a machine-level helper to isolate the process and hide the details to the pnv core realize function. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- hw/ppc/pnv.c | 14 ++++++++++++++ hw/ppc/pnv_core.c | 2 +- include/hw/ppc/pnv.h | 2 ++ 3 files changed, 17 insertions(+), 1 deletion(-)