From patchwork Fri Jun 19 17:17:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 31379 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5JHI54P025035 for ; Fri, 19 Jun 2009 17:18:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751989AbZFSRR7 (ORCPT ); Fri, 19 Jun 2009 13:17:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751021AbZFSRR6 (ORCPT ); Fri, 19 Jun 2009 13:17:58 -0400 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 Received: from mail2.sbs.de (localhost [127.0.0.1]) by gecko.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id n5JHHhcS025777; Fri, 19 Jun 2009 19:17:44 +0200 Received: from [139.25.109.167] (mchn012c.ww002.siemens.net [139.25.109.167] (may be forged)) by mail2.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id n5JHHhlf021563; Fri, 19 Jun 2009 19:17:43 +0200 Message-ID: <4A3BC837.3080102@siemens.com> Date: Fri, 19 Jun 2009 19:17:43 +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: Avi Kivity CC: kvm-devel Subject: [PATCH v2] qemu-kvm: x86: Fix CPU initialization References: <4A3BA861.6040601@siemens.com> <4A3BC6CB.402@siemens.com> In-Reply-To: <4A3BC6CB.402@siemens.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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(-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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.