* [Qemu-devel] [PATCH] x86: Clean up CPU reset
@ 2010-06-23 6:20 Jan Kiszka
2010-06-27 20:23 ` [Qemu-devel] " Blue Swirl
0 siblings, 1 reply; 2+ messages in thread
From: Jan Kiszka @ 2010-06-23 6:20 UTC (permalink / raw)
To: qemu-devel; +Cc: Blue Swirl
From: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
hw/pc.c | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index 1848151..8b9e70a 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -812,20 +812,12 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level)
}
}
-static void bsp_cpu_reset(void *opaque)
+static void pc_cpu_reset(void *opaque)
{
CPUState *env = opaque;
cpu_reset(env);
- env->halted = 0;
-}
-
-static void ap_cpu_reset(void *opaque)
-{
- CPUState *env = opaque;
-
- cpu_reset(env);
- env->halted = 1;
+ env->halted = !cpu_is_bsp(env);
}
static CPUState *pc_new_cpu(const char *cpu_model)
@@ -839,16 +831,10 @@ static CPUState *pc_new_cpu(const char *cpu_model)
}
if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) {
env->cpuid_apic_id = env->cpu_index;
- /* APIC reset callback resets cpu */
env->apic_state = apic_init(env, env->cpuid_apic_id);
}
- if (cpu_is_bsp(env)) {
- qemu_register_reset(bsp_cpu_reset, env);
- env->halted = 0;
- } else {
- qemu_register_reset(ap_cpu_reset, env);
- env->halted = 1;
- }
+ qemu_register_reset(pc_cpu_reset, env);
+ pc_cpu_reset(env);
return env;
}
--
1.6.0.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* [Qemu-devel] Re: [PATCH] x86: Clean up CPU reset
2010-06-23 6:20 [Qemu-devel] [PATCH] x86: Clean up CPU reset Jan Kiszka
@ 2010-06-27 20:23 ` Blue Swirl
0 siblings, 0 replies; 2+ messages in thread
From: Blue Swirl @ 2010-06-27 20:23 UTC (permalink / raw)
To: Jan Kiszka; +Cc: qemu-devel
Thanks, applied.
On Wed, Jun 23, 2010 at 6:20 AM, Jan Kiszka <jan.kiszka@web.de> wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> hw/pc.c | 22 ++++------------------
> 1 files changed, 4 insertions(+), 18 deletions(-)
>
> diff --git a/hw/pc.c b/hw/pc.c
> index 1848151..8b9e70a 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -812,20 +812,12 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level)
> }
> }
>
> -static void bsp_cpu_reset(void *opaque)
> +static void pc_cpu_reset(void *opaque)
> {
> CPUState *env = opaque;
>
> cpu_reset(env);
> - env->halted = 0;
> -}
> -
> -static void ap_cpu_reset(void *opaque)
> -{
> - CPUState *env = opaque;
> -
> - cpu_reset(env);
> - env->halted = 1;
> + env->halted = !cpu_is_bsp(env);
> }
>
> static CPUState *pc_new_cpu(const char *cpu_model)
> @@ -839,16 +831,10 @@ static CPUState *pc_new_cpu(const char *cpu_model)
> }
> if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) {
> env->cpuid_apic_id = env->cpu_index;
> - /* APIC reset callback resets cpu */
> env->apic_state = apic_init(env, env->cpuid_apic_id);
> }
> - if (cpu_is_bsp(env)) {
> - qemu_register_reset(bsp_cpu_reset, env);
> - env->halted = 0;
> - } else {
> - qemu_register_reset(ap_cpu_reset, env);
> - env->halted = 1;
> - }
> + qemu_register_reset(pc_cpu_reset, env);
> + pc_cpu_reset(env);
> return env;
> }
>
> --
> 1.6.0.2
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-06-27 20:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-23 6:20 [Qemu-devel] [PATCH] x86: Clean up CPU reset Jan Kiszka
2010-06-27 20:23 ` [Qemu-devel] " Blue Swirl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).