From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH v2] qemu-kvm: x86: Fix CPU initialization Date: Fri, 19 Jun 2009 19:17:43 +0200 Message-ID: <4A3BC837.3080102@siemens.com> References: <4A3BA861.6040601@siemens.com> <4A3BC6CB.402@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: kvm-devel To: Avi Kivity Return-path: Received: from gecko.sbs.de ([194.138.37.40]:19620 "EHLO gecko.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750821AbZFSRR6 (ORCPT ); Fri, 19 Jun 2009 13:17:58 -0400 In-Reply-To: <4A3BC6CB.402@siemens.com> Sender: kvm-owner@vger.kernel.org List-ID: Jan Kiszka wrote: > Fix regression in CPU initialization caused by merge a5b526135d and try > to avoid this in the future by dropping qemu-kvm specific pc_new_cpu. If > such refactoring is desired, it should go through upstream first. F...ine. I'll write a hundred times: "Don't post while still compiling." Here is a version that only fixes the regression. -----------> Fix regression in CPU initialization caused by merge a5b526135d. Signed-off-by: Jan Kiszka --- hw/pc.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 6c19f55..cb5b4d0 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -853,9 +853,6 @@ CPUState *pc_new_cpu(int cpu, const char *cpu_model, int pci_enabled) apic_init(env); } qemu_register_reset(main_cpu_reset, 0, env); - if (pci_enabled) { - apic_init(env); - } /* kvm needs this to run after the apic is initialized. Otherwise, * it can access invalid state and crash.