From patchwork Wed Jun 23 06:20:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 56591 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D7E6CB6F01 for ; Wed, 23 Jun 2010 16:21:58 +1000 (EST) Received: from localhost ([127.0.0.1]:46477 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ORJLP-0000B3-Vp for incoming@patchwork.ozlabs.org; Wed, 23 Jun 2010 02:21:56 -0400 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 Received: from smtp07.web.de ( [172.20.5.215]) by fmmailgate02.web.de (Postfix) with ESMTP id 817DD168A6966; Wed, 23 Jun 2010 08:20:54 +0200 (CEST) Received: from [92.75.137.1] (helo=[192.168.1.10]) by smtp07.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #4) id 1ORJKQ-0003wb-00; Wed, 23 Jun 2010 08:20:54 +0200 Message-ID: <4C21A7C6.1090504@web.de> Date: Wed, 23 Jun 2010 08:20:54 +0200 From: Jan Kiszka 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 MIME-Version: 1.0 To: qemu-devel X-Enigmail-Version: 0.95.7 X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1+7DrsvaQa3mTX8keK+8VO88/3i7c57ijoQbVnc JzSuy74GSSWFcZmCRWP28UUoNVEmp+7WEVc+D8LoMioWJ1f8jB wvujFcHnE= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Blue Swirl Subject: [Qemu-devel] [PATCH] x86: Clean up CPU reset X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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; }