ppc: replace the 'Object *intc' by a 'ICPState *icp' pointer under the CPU
Now that the 'intc' pointer is only used by the XICS interrupt mode, let's make things clear and use a XICS type and name. Signed-off-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
129dbe6926
commit
3ff73aa241
@ -44,7 +44,7 @@ static target_ulong h_cppr(PowerPCCPU *cpu, sPAPRMachineState *spapr,
|
||||
{
|
||||
target_ulong cppr = args[0];
|
||||
|
||||
icp_set_cppr(ICP(cpu->intc), cppr);
|
||||
icp_set_cppr(cpu->icp, cppr);
|
||||
return H_SUCCESS;
|
||||
}
|
||||
|
||||
@ -65,7 +65,7 @@ static target_ulong h_ipi(PowerPCCPU *cpu, sPAPRMachineState *spapr,
|
||||
static target_ulong h_xirr(PowerPCCPU *cpu, sPAPRMachineState *spapr,
|
||||
target_ulong opcode, target_ulong *args)
|
||||
{
|
||||
uint32_t xirr = icp_accept(ICP(cpu->intc));
|
||||
uint32_t xirr = icp_accept(cpu->icp);
|
||||
|
||||
args[0] = xirr;
|
||||
return H_SUCCESS;
|
||||
@ -74,7 +74,7 @@ static target_ulong h_xirr(PowerPCCPU *cpu, sPAPRMachineState *spapr,
|
||||
static target_ulong h_xirr_x(PowerPCCPU *cpu, sPAPRMachineState *spapr,
|
||||
target_ulong opcode, target_ulong *args)
|
||||
{
|
||||
uint32_t xirr = icp_accept(ICP(cpu->intc));
|
||||
uint32_t xirr = icp_accept(cpu->icp);
|
||||
|
||||
args[0] = xirr;
|
||||
args[1] = cpu_get_host_ticks();
|
||||
@ -86,7 +86,7 @@ static target_ulong h_eoi(PowerPCCPU *cpu, sPAPRMachineState *spapr,
|
||||
{
|
||||
target_ulong xirr = args[0];
|
||||
|
||||
icp_eoi(ICP(cpu->intc), xirr);
|
||||
icp_eoi(cpu->icp, xirr);
|
||||
return H_SUCCESS;
|
||||
}
|
||||
|
||||
@ -94,7 +94,7 @@ static target_ulong h_ipoll(PowerPCCPU *cpu, sPAPRMachineState *spapr,
|
||||
target_ulong opcode, target_ulong *args)
|
||||
{
|
||||
uint32_t mfrr;
|
||||
uint32_t xirr = icp_ipoll(ICP(cpu->intc), &mfrr);
|
||||
uint32_t xirr = icp_ipoll(cpu->icp, &mfrr);
|
||||
|
||||
args[0] = xirr;
|
||||
args[1] = mfrr;
|
||||
|
@ -681,7 +681,7 @@ static void pnv_chip_power8_intc_create(PnvChip *chip, PowerPCCPU *cpu,
|
||||
return;
|
||||
}
|
||||
|
||||
cpu->intc = obj;
|
||||
cpu->icp = ICP(obj);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -1099,7 +1099,7 @@ static ICPState *pnv_icp_get(XICSFabric *xi, int pir)
|
||||
{
|
||||
PowerPCCPU *cpu = ppc_get_vcpu_by_pir(pir);
|
||||
|
||||
return cpu ? ICP(cpu->intc) : NULL;
|
||||
return cpu ? cpu->icp : NULL;
|
||||
}
|
||||
|
||||
static void pnv_pic_print_info(InterruptStatsProvider *obj,
|
||||
@ -1112,7 +1112,7 @@ static void pnv_pic_print_info(InterruptStatsProvider *obj,
|
||||
CPU_FOREACH(cs) {
|
||||
PowerPCCPU *cpu = POWERPC_CPU(cs);
|
||||
|
||||
icp_pic_print_info(ICP(cpu->intc), mon);
|
||||
icp_pic_print_info(cpu->icp, mon);
|
||||
}
|
||||
|
||||
for (i = 0; i < pnv->num_chips; i++) {
|
||||
|
@ -190,7 +190,7 @@ err:
|
||||
static void pnv_unrealize_vcpu(PowerPCCPU *cpu)
|
||||
{
|
||||
qemu_unregister_reset(pnv_cpu_reset, cpu);
|
||||
object_unparent(cpu->intc);
|
||||
object_unparent(OBJECT(cpu->icp));
|
||||
cpu_remove_sync(CPU(cpu));
|
||||
object_unparent(OBJECT(cpu));
|
||||
}
|
||||
|
@ -3887,7 +3887,7 @@ static ICPState *spapr_icp_get(XICSFabric *xi, int vcpu_id)
|
||||
{
|
||||
PowerPCCPU *cpu = spapr_find_cpu(vcpu_id);
|
||||
|
||||
return cpu ? ICP(cpu->intc) : NULL;
|
||||
return cpu ? cpu->icp : NULL;
|
||||
}
|
||||
|
||||
static void spapr_pic_print_info(InterruptStatsProvider *obj,
|
||||
|
@ -194,8 +194,8 @@ static void spapr_unrealize_vcpu(PowerPCCPU *cpu, sPAPRCPUCore *sc)
|
||||
vmstate_unregister(NULL, &vmstate_spapr_cpu_state, cpu->machine_data);
|
||||
}
|
||||
qemu_unregister_reset(spapr_cpu_reset, cpu);
|
||||
if (cpu->intc) {
|
||||
object_unparent(cpu->intc);
|
||||
if (cpu->icp) {
|
||||
object_unparent(OBJECT(cpu->icp));
|
||||
}
|
||||
if (cpu->tctx) {
|
||||
object_unparent(OBJECT(cpu->tctx));
|
||||
|
@ -184,7 +184,7 @@ static void spapr_irq_print_info_xics(sPAPRMachineState *spapr, Monitor *mon)
|
||||
CPU_FOREACH(cs) {
|
||||
PowerPCCPU *cpu = POWERPC_CPU(cs);
|
||||
|
||||
icp_pic_print_info(ICP(cpu->intc), mon);
|
||||
icp_pic_print_info(cpu->icp, mon);
|
||||
}
|
||||
|
||||
ics_pic_print_info(spapr->ics, mon);
|
||||
@ -203,7 +203,7 @@ static void spapr_irq_cpu_intc_create_xics(sPAPRMachineState *spapr,
|
||||
return;
|
||||
}
|
||||
|
||||
cpu->intc = obj;
|
||||
cpu->icp = ICP(obj);
|
||||
}
|
||||
|
||||
static int spapr_irq_post_load_xics(sPAPRMachineState *spapr, int version_id)
|
||||
@ -212,7 +212,7 @@ static int spapr_irq_post_load_xics(sPAPRMachineState *spapr, int version_id)
|
||||
CPUState *cs;
|
||||
CPU_FOREACH(cs) {
|
||||
PowerPCCPU *cpu = POWERPC_CPU(cs);
|
||||
icp_resend(ICP(cpu->intc));
|
||||
icp_resend(cpu->icp);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
|
@ -1178,6 +1178,7 @@ do { \
|
||||
typedef struct PPCVirtualHypervisor PPCVirtualHypervisor;
|
||||
typedef struct PPCVirtualHypervisorClass PPCVirtualHypervisorClass;
|
||||
typedef struct XiveTCTX XiveTCTX;
|
||||
typedef struct ICPState ICPState;
|
||||
|
||||
/**
|
||||
* PowerPCCPU:
|
||||
@ -1196,7 +1197,7 @@ struct PowerPCCPU {
|
||||
int vcpu_id;
|
||||
uint32_t compat_pvr;
|
||||
PPCVirtualHypervisor *vhyp;
|
||||
Object *intc;
|
||||
ICPState *icp;
|
||||
XiveTCTX *tctx;
|
||||
void *machine_data;
|
||||
int32_t node_id; /* NUMA node this CPU belongs to */
|
||||
|
Loading…
Reference in New Issue
Block a user