diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-05 01:14:41 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:42 +0200 |
| commit | 232fc23bed97f92b939d5b2802a481c1dea5991b (patch) | |
| tree | 0d7c68623e94e841834f53c0a292b12956770fe2 /target-i386/helper.c | |
| parent | bf494367fa77b5ed872d8add50677542a7141836 (diff) | |
| download | qemu-232fc23bed97f92b939d5b2802a481c1dea5991b.zip qemu-232fc23bed97f92b939d5b2802a481c1dea5991b.tar.gz qemu-232fc23bed97f92b939d5b2802a481c1dea5991b.tar.bz2 | |
target-i386: Pass X86CPU to do_cpu_{init,sipi}()
Allows to use cpu_reset() in place of cpu_state_reset().
Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Diffstat (limited to 'target-i386/helper.c')
| -rw-r--r-- | target-i386/helper.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c index 3421be2..e182025 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1187,27 +1187,30 @@ CPUX86State *cpu_x86_init(const char *cpu_model) } #if !defined(CONFIG_USER_ONLY) -void do_cpu_init(CPUX86State *env) +void do_cpu_init(X86CPU *cpu) { + CPUX86State *env = &cpu->env; int sipi = env->interrupt_request & CPU_INTERRUPT_SIPI; uint64_t pat = env->pat; - cpu_state_reset(env); + cpu_reset(CPU(cpu)); env->interrupt_request = sipi; env->pat = pat; apic_init_reset(env->apic_state); env->halted = !cpu_is_bsp(env); } -void do_cpu_sipi(CPUX86State *env) +void do_cpu_sipi(X86CPU *cpu) { + CPUX86State *env = &cpu->env; + apic_sipi(env->apic_state); } #else -void do_cpu_init(CPUX86State *env) +void do_cpu_init(X86CPU *cpu) { } -void do_cpu_sipi(CPUX86State *env) +void do_cpu_sipi(X86CPU *cpu) { } #endif |