On Wed, Mar 06, 2019 at 09:50:10AM +0100, Cédric Le Goater wrote: > The POWER9 PowerNV machine will use a XIVE interrupt presenter type. > > Signed-off-by: Cédric Le Goater <c...@kaod.org>
Applied patches 2..5. > --- > include/hw/ppc/pnv_core.h | 2 +- > hw/ppc/pnv.c | 6 +++--- > hw/ppc/pnv_core.c | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h > index 9961ea3a92cd..6874bb847a01 100644 > --- a/include/hw/ppc/pnv_core.h > +++ b/include/hw/ppc/pnv_core.h > @@ -48,7 +48,7 @@ typedef struct PnvCoreClass { > #define PNV_CORE_TYPE_NAME(cpu_model) cpu_model PNV_CORE_TYPE_SUFFIX > > typedef struct PnvCPUState { > - struct ICPState *icp; > + Object *intc; > } PnvCPUState; > > static inline PnvCPUState *pnv_cpu_state(PowerPCCPU *cpu) > diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c > index 9aa81c7f09c2..b90d03711a05 100644 > --- a/hw/ppc/pnv.c > +++ b/hw/ppc/pnv.c > @@ -684,7 +684,7 @@ static void pnv_chip_power8_intc_create(PnvChip *chip, > PowerPCCPU *cpu, > return; > } > > - pnv_cpu->icp = ICP(obj); > + pnv_cpu->intc = obj; > } > > /* > @@ -1086,7 +1086,7 @@ static ICPState *pnv_icp_get(XICSFabric *xi, int pir) > { > PowerPCCPU *cpu = ppc_get_vcpu_by_pir(pir); > > - return cpu ? pnv_cpu_state(cpu)->icp : NULL; > + return cpu ? ICP(pnv_cpu_state(cpu)->intc) : NULL; > } > > static void pnv_pic_print_info(InterruptStatsProvider *obj, > @@ -1099,7 +1099,7 @@ static void pnv_pic_print_info(InterruptStatsProvider > *obj, > CPU_FOREACH(cs) { > PowerPCCPU *cpu = POWERPC_CPU(cs); > > - icp_pic_print_info(pnv_cpu_state(cpu)->icp, mon); > + icp_pic_print_info(ICP(pnv_cpu_state(cpu)->intc), mon); > } > > for (i = 0; i < pnv->num_chips; i++) { > diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c > index 7c806da720c6..38179cdc53dc 100644 > --- a/hw/ppc/pnv_core.c > +++ b/hw/ppc/pnv_core.c > @@ -198,7 +198,7 @@ static void pnv_unrealize_vcpu(PowerPCCPU *cpu) > PnvCPUState *pnv_cpu = pnv_cpu_state(cpu); > > qemu_unregister_reset(pnv_cpu_reset, cpu); > - object_unparent(OBJECT(pnv_cpu_state(cpu)->icp)); > + object_unparent(OBJECT(pnv_cpu_state(cpu)->intc)); > cpu_remove_sync(CPU(cpu)); > cpu->machine_data = NULL; > g_free(pnv_cpu); -- 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