diff options
| author | Alexey Kardashevskiy <aik@ozlabs.ru> | 2013-09-26 16:18:43 +1000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-10-25 23:25:47 +0200 |
| commit | 5eb92ccc3f23f958c0d21bed7c22abe6c1f1adda (patch) | |
| tree | d4d939b0c4278b5a4bf14cb46fc9118b8640b36a | |
| parent | 5a3d7b23ba41b4884b43b6bc936ea18f999d5c6b (diff) | |
| download | qemu-5eb92ccc3f23f958c0d21bed7c22abe6c1f1adda.tar.gz | |
xics: add cpu_setup callback
This adds a cpu_setup callback to the XICS device class (as XICS-KVM
will do it different), xics_cpu_setup() will call it if it is set.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | hw/intc/xics.c | 5 | ||||
| -rw-r--r-- | include/hw/ppc/xics.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 5ed2618769..1c6e6f5454 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -37,9 +37,14 @@ void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu) CPUState *cs = CPU(cpu); CPUPPCState *env = &cpu->env; ICPState *ss = &icp->ss[cs->cpu_index]; + XICSStateClass *info = XICS_COMMON_GET_CLASS(icp); assert(cs->cpu_index < icp->nr_servers); + if (info->cpu_setup) { + info->cpu_setup(icp, cpu); + } + switch (PPC_INPUT(env)) { case PPC_FLAGS_INPUT_POWER7: ss->output = env->irq_inputs[POWER7_INPUT_INT]; diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 7e702a0068..343bba80f8 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -64,6 +64,7 @@ typedef struct ICSIRQState ICSIRQState; struct XICSStateClass { DeviceClass parent_class; + void (*cpu_setup)(XICSState *icp, PowerPCCPU *cpu); void (*set_nr_irqs)(XICSState *icp, uint32_t nr_irqs, Error **errp); void (*set_nr_servers)(XICSState *icp, uint32_t nr_servers, Error **errp); }; |