[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH] x86: Clean up CPU reset
From: |
Blue Swirl |
Subject: |
[Qemu-devel] Re: [PATCH] x86: Clean up CPU reset |
Date: |
Sun, 27 Jun 2010 20:23:55 +0000 |
Thanks, applied.
On Wed, Jun 23, 2010 at 6:20 AM, Jan Kiszka <address@hidden> wrote:
> From: Jan Kiszka <address@hidden>
>
> Signed-off-by: Jan Kiszka <address@hidden>
> ---
> 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
>