mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ppc/xics: simplify the cpu_setup() handler

Browse Source 
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 <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Cédric Le Goater 2017-02-27 15:29:23 +01:00 committed by David Gibson
parent 729f8a4f48
commit bf50860d1b
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/intc/xics.c
View File

@ -66,14 +66,15 @@ void xics_cpu_setup(XICSState *xics, PowerPCCPU *cpu)
CPUState *cs = CPU(cpu); CPUState *cs = CPU(cpu);
CPUPPCState *env = &cpu->env; CPUPPCState *env = &cpu->env;
ICPState *ss = &xics->ss[cs->cpu_index]; ICPState *ss = &xics->ss[cs->cpu_index];
XICSStateClass *info = XICS_COMMON_GET_CLASS(xics); XICSStateClass *info;
assert(cs->cpu_index < xics->nr_servers); assert(cs->cpu_index < xics->nr_servers);
ss->cs = cs; ss->cs = cs;
info = XICS_COMMON_GET_CLASS(xics);
if (info->cpu_setup) { if (info->cpu_setup) {
info->cpu_setup(xics, cpu); info->cpu_setup(ss, cpu);
} }
switch (PPC_INPUT(env)) { switch (PPC_INPUT(env)) {

9
hw/intc/xics_kvm.c
View File

@ -324,16 +324,11 @@ static const TypeInfo ics_kvm_info = {
/* /*
* XICS-KVM * XICS-KVM
*/ */
static void xics_kvm_cpu_setup(XICSState *xics, PowerPCCPU *cpu) static void xics_kvm_cpu_setup(ICPState *ss, PowerPCCPU *cpu)
{ {
CPUState *cs; CPUState *cs = CPU(cpu);
ICPState *ss;
int ret; int ret;
cs = CPU(cpu);
ss = &xics->ss[cs->cpu_index];
assert(cs->cpu_index < xics->nr_servers);
if (kernel_xics_fd == -1) { if (kernel_xics_fd == -1) {
abort(); abort();
} }

2
include/hw/ppc/xics.h
View File

@ -74,7 +74,7 @@ typedef struct XICSFabric XICSFabric;
struct XICSStateClass { struct XICSStateClass {
DeviceClass parent_class; DeviceClass parent_class;
void (*cpu_setup)(XICSState *icp, PowerPCCPU *cpu); void (*cpu_setup)(ICPState *icp, PowerPCCPU *cpu);
}; };
struct XICSState { struct XICSState {