From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MDxMI-00025q-JA for qemu-devel@nongnu.org; Tue, 09 Jun 2009 05:11:06 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MDxMD-00025P-UO for qemu-devel@nongnu.org; Tue, 09 Jun 2009 05:11:05 -0400 Received: from [199.232.76.173] (port=34528 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MDxMD-00025G-Jd for qemu-devel@nongnu.org; Tue, 09 Jun 2009 05:11:01 -0400 Received: from mx2.redhat.com ([66.187.237.31]:50371) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MDxMD-0006DO-8h for qemu-devel@nongnu.org; Tue, 09 Jun 2009 05:11:01 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n599B0Lp014994 for ; Tue, 9 Jun 2009 05:11:00 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n599AxRV000955 for ; Tue, 9 Jun 2009 05:10:59 -0400 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n599AwOa021135 for ; Tue, 9 Jun 2009 05:10:58 -0400 From: Gleb Natapov Date: Tue, 9 Jun 2009 12:10:57 +0300 Message-Id: <1244538657-7878-2-git-send-email-gleb@redhat.com> In-Reply-To: <1244538657-7878-1-git-send-email-gleb@redhat.com> References: <1244538657-7878-1-git-send-email-gleb@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] Don't register cpu reset handler for cpu with APIC. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org APIC reset handler already resets cpu. Also register cpu_reset handler directly to make it impossible to add additional code to main_cpu_reset() by mistake. Signed-off-by: Gleb Natapov --- hw/pc.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index d5b4112..5e7b115 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -751,12 +751,6 @@ static void load_linux(target_phys_addr_t option_rom, generate_bootsect(option_rom, gpr, seg, 0); } -static void main_cpu_reset(void *opaque) -{ - CPUState *env = opaque; - cpu_reset(env); -} - static const int ide_iobase[2] = { 0x1f0, 0x170 }; static const int ide_iobase2[2] = { 0x3f6, 0x376 }; static const int ide_irq[2] = { 14, 15 }; @@ -878,9 +872,11 @@ static void pc_init1(ram_addr_t ram_size, } if (i != 0) env->halted = 1; - qemu_register_reset(main_cpu_reset, 0, env); if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) { apic_init(env); + } else { + /* APIC reset callback resets cpu */ + qemu_register_reset((QEMUResetHandler*)cpu_reset, 0, env); } } -- 1.6.2.1