From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=50035 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ORJKT-0000AP-1D for qemu-devel@nongnu.org; Wed, 23 Jun 2010 02:20:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1ORJKR-0005iM-QO for qemu-devel@nongnu.org; Wed, 23 Jun 2010 02:20:56 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:59881) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ORJKR-0005i9-Gc for qemu-devel@nongnu.org; Wed, 23 Jun 2010 02:20:55 -0400 Message-ID: <4C21A7C6.1090504@web.de> Date: Wed, 23 Jun 2010 08:20:54 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH] x86: Clean up CPU reset List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Cc: Blue Swirl From: Jan Kiszka Signed-off-by: Jan Kiszka --- 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