diff options
| author | Anthony Liguori | 2012-03-14 22:47:49 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2012-03-14 22:47:49 +0100 |
| commit | aea6ff7fa07b046fb9f43d6262d6e34b77e8437e (patch) | |
| tree | dd3043d1742273a95fa7fc5e99b8d5ffe0c710e5 /hw/spapr.h | |
| parent | vnc: Limit r/w access to size of allocated memory (diff) | |
| parent | qom: Introduce CPU class (diff) | |
| download | qemu-aea6ff7fa07b046fb9f43d6262d6e34b77e8437e.tar.gz qemu-aea6ff7fa07b046fb9f43d6262d6e34b77e8437e.tar.xz qemu-aea6ff7fa07b046fb9f43d6262d6e34b77e8437e.zip | |
Merge remote-tracking branch 'afaerber/qom-cpu.v5' into staging
* afaerber/qom-cpu.v5: (43 commits)
qom: Introduce CPU class
Rename CPUState -> CPUArchState
xtensa hw/: Don't use CPUState
sparc hw/: Don't use CPUState
sh4 hw/: Don't use CPUState
s390x hw/: Don't use CPUState
ppc hw/: Don't use CPUState
mips hw/: Don't use CPUState
microblaze hw/: Don't use CPUState
m68k hw/: Don't use CPUState
lm32 hw/: Don't use CPUState
i386 hw/: Don't use CPUState
cris hw/: Don't use CPUState
arm hw/: Don't use CPUState
alpha hw/: Don't use CPUState
xtensa-semi: Don't use CPUState
m68k-semi: Don't use CPUState
arm-semi: Don't use CPUState
target-xtensa: Don't overuse CPUState
target-unicore32: Don't overuse CPUState
...
Diffstat (limited to 'hw/spapr.h')
| -rw-r--r-- | hw/spapr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/spapr.h b/hw/spapr.h index e946a3433e..a41641fdde 100644 --- a/hw/spapr.h +++ b/hw/spapr.h @@ -278,12 +278,12 @@ extern sPAPREnvironment *spapr; do { } while (0) #endif -typedef target_ulong (*spapr_hcall_fn)(CPUState *env, sPAPREnvironment *spapr, +typedef target_ulong (*spapr_hcall_fn)(CPUPPCState *env, sPAPREnvironment *spapr, target_ulong opcode, target_ulong *args); void spapr_register_hypercall(target_ulong opcode, spapr_hcall_fn fn); -target_ulong spapr_hypercall(CPUState *env, target_ulong opcode, +target_ulong spapr_hypercall(CPUPPCState *env, target_ulong opcode, target_ulong *args); qemu_irq spapr_allocate_irq(uint32_t hint, uint32_t *irq_num); |