From patchwork Thu Mar  3 11:36:35 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: "SourceForge.net" <noreply@sourceforge.net>
X-Patchwork-Id: 605911
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p23Baevj026949
	for <patchwork-kvm@patchwork.kernel.org>; Thu, 3 Mar 2011 11:36:41 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756336Ab1CCLgh (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Thu, 3 Mar 2011 06:36:37 -0500
Received: from ch3.sourceforge.net ([216.34.181.60]:36477 "EHLO
	ch3.sourceforge.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751325Ab1CCLgh (ORCPT <rfc822; kvm@vger.kernel.org>);
	Thu, 3 Mar 2011 06:36:37 -0500
Received: from www by sfs-web-3.v29.ch3.sourceforge.com with local (Exim
	4.74) (envelope-from <noreply@sourceforge.net>)
	id 1Pv6pf-0006Pb-Rk; Thu, 03 Mar 2011 11:36:35 +0000
To: noreply@sourceforge.net
From: "SourceForge.net" <noreply@sourceforge.net>
Subject: [ kvm-Bugs-2835276 ] segfault using -cpu pentium3 on coreduo
Mime-Version: 1.0
X-SourceForge-Tracker-unixname: kvm
X-SourceForge-Tracker-trackerid: 893831
X-SourceForge-Tracker-itemid: 2835276
X-SourceForge-Tracker-itemstatus: Closed
X-SourceForge-Tracker-itemassignee: nobody
X-SourceForge-Tracker-itemupdate-reason: Comment added
X-SourceForge-Tracker-itemupdate-username: jessorensen
Message-Id: <E1Pv6pf-0006Pb-Rk@sfs-web-3.v29.ch3.sourceforge.com>
Date: Thu, 03 Mar 2011 11:36:35 +0000
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Thu, 03 Mar 2011 11:36:41 +0000 (UTC)


--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1096,11 +1096,11 @@ 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 */
-            apic_init(env);
         } else {
             qemu_register_reset((QEMUResetHandler*)cpu_reset, env);
         }
+            /* APIC reset callback resets cpu */
+            apic_init(env);
 
     /* kvm needs this to run after the apic is initialized. Otherwise,
      * it can access invalid state and crash.