[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] target-i386: Initialize CPUState::halted in cpu_res
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH] target-i386: Initialize CPUState::halted in cpu_reset |
Date: |
Tue, 26 Apr 2011 10:50:48 +0200 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 |
Instead of having an extra reset function at machine level and special
code for processing INIT, move the initialization of halted into the
cpu reset handler.
Signed-off-by: Jan Kiszka <address@hidden>
---
hw/pc.c | 12 ++----------
target-i386/helper.c | 5 ++++-
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index 6939c04..8ef86db 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -913,14 +913,6 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int
level)
}
}
-static void pc_cpu_reset(void *opaque)
-{
- CPUState *env = opaque;
-
- cpu_reset(env);
- env->halted = !cpu_is_bsp(env);
-}
-
static CPUState *pc_new_cpu(const char *cpu_model)
{
CPUState *env;
@@ -934,8 +926,8 @@ static CPUState *pc_new_cpu(const char *cpu_model)
env->cpuid_apic_id = env->cpu_index;
env->apic_state = apic_init(env, env->cpuid_apic_id);
}
- qemu_register_reset(pc_cpu_reset, env);
- pc_cpu_reset(env);
+ qemu_register_reset((QEMUResetHandler *)cpu_reset, env);
+ cpu_reset(env);
return env;
}
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 89df997..56cca96 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -106,6 +106,10 @@ void cpu_reset(CPUX86State *env)
env->dr[7] = DR7_FIXED_1;
cpu_breakpoint_remove_all(env, BP_CPU);
cpu_watchpoint_remove_all(env, BP_CPU);
+
+#if !defined(CONFIG_USER_ONLY)
+ env->halted = !cpu_is_bsp(env);
+#endif
}
void cpu_x86_close(CPUX86State *env)
@@ -1282,7 +1286,6 @@ void do_cpu_init(CPUState *env)
env->interrupt_request = sipi;
env->pat = pat;
apic_init_reset(env->apic_state);
- env->halted = !cpu_is_bsp(env);
}
void do_cpu_sipi(CPUState *env)
- [Qemu-devel] [PATCH] target-i386: Initialize CPUState::halted in cpu_reset,
Jan Kiszka <=
- Re: [Qemu-devel] [PATCH] target-i386: Initialize CPUState::halted in cpu_reset, Blue Swirl, 2011/04/26
- Re: [Qemu-devel] [PATCH] target-i386: Initialize CPUState::halted in cpu_reset, Jan Kiszka, 2011/04/26
- Re: [Qemu-devel] [PATCH] target-i386: Initialize CPUState::halted in cpu_reset, Blue Swirl, 2011/04/26
- Re: [Qemu-devel] [PATCH] target-i386: Initialize CPUState::halted in cpu_reset, Jan Kiszka, 2011/04/27
- Re: [Qemu-devel] [PATCH] target-i386: Initialize CPUState::halted in cpu_reset, Blue Swirl, 2011/04/27
- Re: [Qemu-devel] [PATCH] target-i386: Initialize CPUState::halted in cpu_reset, Jan Kiszka, 2011/04/27
- Re: [Qemu-devel] [PATCH] target-i386: Initialize CPUState::halted in cpu_reset, Blue Swirl, 2011/04/27