diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-04-02 23:20:08 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-04-10 17:10:27 +0200 |
| commit | 5fd2087a1b7b3075828de741d76188441ee35bc8 (patch) | |
| tree | 42a1d1abec5d4997f4905c860a87fa58a61c83a5 /target-i386/cpu.h | |
| parent | 30471bc94e1eb4ce1c87a56b6210a3baa1698d58 (diff) | |
| download | qemu-5fd2087a1b7b3075828de741d76188441ee35bc8.tar.gz | |
target-i386: QOM'ify CPU
Embed CPUX86State as first member of X86CPU.
Distinguish between "x86_64-cpu" and "i386-cpu".
Drop cpu_x86_close() in favor of calling object_delete() directly.
For now let CPUClass::reset() call cpu_state_reset().
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-i386/cpu.h')
| -rw-r--r-- | target-i386/cpu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h index a1ed3e72ea..4bb4592db5 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -783,9 +783,10 @@ typedef struct CPUX86State { TPRAccess tpr_access_type; } CPUX86State; +#include "cpu-qom.h" + CPUX86State *cpu_x86_init(const char *cpu_model); int cpu_x86_exec(CPUX86State *s); -void cpu_x86_close(CPUX86State *s); void x86_cpu_list (FILE *f, fprintf_function cpu_fprintf, const char *optarg); void x86_cpudef_setup(void); int cpu_x86_support_mca_broadcast(CPUX86State *env); |