diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-08-24 18:36:49 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-08-24 18:36:49 +0300 |
| commit | fe6fc7bdaf9b0b13ec40f517113ebc3eefabe548 (patch) | |
| tree | 367007de80911198edf9e9031844ef80fdb38a98 /target-ppc | |
| parent | Merge commit '4a1418e07bdcfaa3177739e04707ecaec75d89e1' into upstream-merge (diff) | |
| parent | make pthreads mandatory (diff) | |
| download | qemu-kvm-fe6fc7bdaf9b0b13ec40f517113ebc3eefabe548.tar.gz qemu-kvm-fe6fc7bdaf9b0b13ec40f517113ebc3eefabe548.tar.bz2 qemu-kvm-fe6fc7bdaf9b0b13ec40f517113ebc3eefabe548.zip | |
Merge commit '4dd75c702c96ec84db4efe24fcc80a4d7bb32df2' into upstream-merge
* commit '4dd75c702c96ec84db4efe24fcc80a4d7bb32df2':
make pthreads mandatory
qemu: move virtio-pci.o to near pci.o
char: Emit 'CLOSED' events on char device close
cleanup cpu-exec.c, part 0/N: consolidate handle_cpu_signal
unify popen/fopen qemu wrappers
Only build osdep once
Conflicts:
block/raw-posix.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-ppc')
| -rw-r--r-- | target-ppc/cpu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 4f340f3b7..ff6bb34c8 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -707,6 +707,7 @@ int cpu_ppc_signal_handler (int host_signum, void *pinfo, void *puc); int cpu_ppc_handle_mmu_fault (CPUPPCState *env, target_ulong address, int rw, int mmu_idx, int is_softmmu); +#define cpu_handle_mmu_fault cpu_ppc_handle_mmu_fault int get_physical_address (CPUPPCState *env, mmu_ctx_t *ctx, target_ulong vaddr, int rw, int access_type); void do_interrupt (CPUPPCState *env); |