diff options
| author | Blue Swirl | 2012-05-01 11:27:53 +0200 |
|---|---|---|
| committer | Blue Swirl | 2012-05-01 11:27:53 +0200 |
| commit | 61d25e1548b5e5ec8b670e72e82a2a7b909f9d52 (patch) | |
| tree | 6cfa2f23703fe891504e71ac4349de227e7ff746 /target-mips/cpu.h | |
| parent | main-loop: Fix build for w32 and w64 (diff) | |
| parent | Makefile: Simplify compilation of target-*/cpu.c (diff) | |
| download | qemu-61d25e1548b5e5ec8b670e72e82a2a7b909f9d52.tar.gz qemu-61d25e1548b5e5ec8b670e72e82a2a7b909f9d52.tar.xz qemu-61d25e1548b5e5ec8b670e72e82a2a7b909f9d52.zip | |
Merge branch 'qom-cpu-rest.v1' of git://github.com/afaerber/qemu-cpu
* 'qom-cpu-rest.v1' of git://github.com/afaerber/qemu-cpu:
Makefile: Simplify compilation of target-*/cpu.c
target-mips: Start QOM'ifying CPU init
target-mips: QOM'ify CPU
target-m68k: Add QOM CPU subclasses
target-m68k: Start QOM'ifying CPU init
target-m68k: QOM'ify CPU reset
target-m68k: QOM'ify CPU
target-sh4: Start QOM'ifying CPU init
target-sh4: QOM'ify CPU reset
target-sh4: QOM'ify CPU
MAINTAINERS: Downgrade target-mips and target-sh4 to Odd Fixes
MAINTAINERS: Downgrade target-m68k to Odd Fixes
Diffstat (limited to 'target-mips/cpu.h')
| -rw-r--r-- | target-mips/cpu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/target-mips/cpu.h b/target-mips/cpu.h index f156c066a8..c0f882659c 100644 --- a/target-mips/cpu.h +++ b/target-mips/cpu.h @@ -476,6 +476,8 @@ struct CPUMIPSState { struct QEMUTimer *timer; /* Internal timer */ }; +#include "cpu-qom.h" + #if !defined(CONFIG_USER_ONLY) int no_mmu_map_address (CPUMIPSState *env, target_phys_addr_t *physical, int *prot, target_ulong address, int rw, int access_type); |