[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH v3 15/24] ppc/xics: simplify the cpu_setup() handler
From: |
Cédric Le Goater |
Subject: |
[Qemu-ppc] [PATCH v3 15/24] ppc/xics: simplify the cpu_setup() handler |
Date: |
Fri, 24 Feb 2017 11:18:14 +0100 |
The cpu_setup() handler currently takes a 'XICSState *' argument to
grab the kernel ICP file descriptor. This interface can be simplified
by using the 'xics' backlink of the ICP object.
This change is also required by subsequent patches which makes use of
the QOM interface for XICS.
Signed-off-by: Cédric Le Goater <address@hidden>
---
hw/intc/xics.c | 5 +++--
hw/intc/xics_kvm.c | 11 +++--------
include/hw/ppc/xics.h | 2 +-
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index 05922a040fb5..5e98d53ecc94 100644
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -66,14 +66,15 @@ void xics_cpu_setup(XICSState *xics, PowerPCCPU *cpu)
CPUState *cs = CPU(cpu);
CPUPPCState *env = &cpu->env;
ICPState *ss = &xics->ss[cs->cpu_index];
- XICSStateClass *info = XICS_COMMON_GET_CLASS(xics);
+ XICSStateClass *info;
assert(cs->cpu_index < xics->nr_servers);
ss->cs = cs;
+ info = XICS_COMMON_GET_CLASS(ss->xics);
if (info->cpu_setup) {
- info->cpu_setup(xics, cpu);
+ info->cpu_setup(ss, cpu);
}
switch (PPC_INPUT(env)) {
diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
index 6cabc11f6be1..3941f31c5b3f 100644
--- a/hw/intc/xics_kvm.c
+++ b/hw/intc/xics_kvm.c
@@ -334,17 +334,12 @@ static const TypeInfo ics_kvm_info = {
/*
* XICS-KVM
*/
-static void xics_kvm_cpu_setup(XICSState *xics, PowerPCCPU *cpu)
+static void xics_kvm_cpu_setup(ICPState *ss, PowerPCCPU *cpu)
{
- CPUState *cs;
- ICPState *ss;
- KVMXICSState *xicskvm = XICS_SPAPR_KVM(xics);
+ CPUState *cs = CPU(cpu);
+ KVMXICSState *xicskvm = XICS_SPAPR_KVM(ss->xics);
int ret;
- cs = CPU(cpu);
- ss = &xics->ss[cs->cpu_index];
-
- assert(cs->cpu_index < xics->nr_servers);
if (xicskvm->kernel_xics_fd == -1) {
abort();
}
diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
index 814f7ebe2246..3e7bee107da5 100644
--- a/include/hw/ppc/xics.h
+++ b/include/hw/ppc/xics.h
@@ -73,7 +73,7 @@ typedef struct ICSIRQState ICSIRQState;
struct XICSStateClass {
DeviceClass parent_class;
- void (*cpu_setup)(XICSState *icp, PowerPCCPU *cpu);
+ void (*cpu_setup)(ICPState *icp, PowerPCCPU *cpu);
};
struct XICSState {
--
2.7.4
- [Qemu-ppc] [PATCH v3 05/24] ppc/xics: store the ICS object under the sPAPR machine, (continued)
- [Qemu-ppc] [PATCH v3 05/24] ppc/xics: store the ICS object under the sPAPR machine, Cédric Le Goater, 2017/02/24
- [Qemu-ppc] [PATCH v3 06/24] ppc/xics: add an InterruptStatsProvider interface to ICS and ICP objects, Cédric Le Goater, 2017/02/24
- [Qemu-ppc] [PATCH v3 07/24] ppc/xics: introduce a XICSFabric QOM interface to handle ICSs, Cédric Le Goater, 2017/02/24
- [Qemu-ppc] [PATCH v3 08/24] ppc/xics: use the QOM interface under the sPAPR machine, Cédric Le Goater, 2017/02/24
- [Qemu-ppc] [PATCH v3 09/24] ppc/xics: use the QOM interface to get irqs, Cédric Le Goater, 2017/02/24
- [Qemu-ppc] [PATCH v3 10/24] ppc/xics: use the QOM interface to resend irqs, Cédric Le Goater, 2017/02/24
- [Qemu-ppc] [PATCH v3 11/24] ppc/xics: remove xics_find_source(), Cédric Le Goater, 2017/02/24
- [Qemu-ppc] [PATCH v3 12/24] ppc/xics: register the reset handler of ICS objects, Cédric Le Goater, 2017/02/24
- [Qemu-ppc] [PATCH v3 13/24] ppc/xics: remove the XICS list of ICS, Cédric Le Goater, 2017/02/24
- [Qemu-ppc] [PATCH v3 14/24] ppc/xics: extend the QOM interface to handle ICPs, Cédric Le Goater, 2017/02/24
- [Qemu-ppc] [PATCH v3 15/24] ppc/xics: simplify the cpu_setup() handler,
Cédric Le Goater <=
- [Qemu-ppc] [PATCH v3 16/24] ppc/xics: use the QOM interface to grab an ICP, Cédric Le Goater, 2017/02/24
- [Qemu-ppc] [PATCH v3 17/24] ppc/xics: simplify spapr_dt_xics() interface, Cédric Le Goater, 2017/02/24
- [Qemu-ppc] [PATCH v3 18/24] ppc/xics: register the reset handler of ICP objects, Cédric Le Goater, 2017/02/24
- [Qemu-ppc] [PATCH v3 19/24] ppc/xics: move the ICP array under the sPAPR machine, Cédric Le Goater, 2017/02/24
- [Qemu-ppc] [PATCH v3 20/24] ppc/xics: move kernel_xics_fd out of KVMXICSState, Cédric Le Goater, 2017/02/24
- [Qemu-ppc] [PATCH v3 21/24] ppc/xics: move the cpu_setup() handler under the ICPState class, Cédric Le Goater, 2017/02/24
- [Qemu-ppc] [PATCH v3 22/24] ppc/xics: remove the 'xics' backlinks, Cédric Le Goater, 2017/02/24
- [Qemu-ppc] [PATCH v3 23/24] ppc/xics: export the XICS init routines, Cédric Le Goater, 2017/02/24
- [Qemu-ppc] [PATCH v3 24/24] ppc/xics: remove the XICSState classes, Cédric Le Goater, 2017/02/24
- Re: [Qemu-ppc] [PATCH v3 00/24] ppc/xics: simplify ICS and ICP creation, Cédric Le Goater, 2017/02/24