From patchwork Mon Mar 1 17:17:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 46575 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 1CB5DB7D1A for ; Tue, 2 Mar 2010 04:43:56 +1100 (EST) Received: from localhost ([127.0.0.1]:41589 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nm9aS-0002aq-Hf for incoming@patchwork.ozlabs.org; Mon, 01 Mar 2010 12:39:20 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nm9Fl-0000Ef-5s for qemu-devel@nongnu.org; Mon, 01 Mar 2010 12:17:57 -0500 Received: from [199.232.76.173] (port=41210 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nm9Fk-0000E0-Ge for qemu-devel@nongnu.org; Mon, 01 Mar 2010 12:17:56 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nm9FZ-0004LI-3q for qemu-devel@nongnu.org; Mon, 01 Mar 2010 12:17:55 -0500 Received: from david.siemens.de ([192.35.17.14]:23132) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Nm9FO-0004JG-PD for qemu-devel@nongnu.org; Mon, 01 Mar 2010 12:17:36 -0500 Received: from mail2.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o21HHVUY020551; Mon, 1 Mar 2010 18:17:31 +0100 Received: from localhost.localdomain (mchn012c.mchp.siemens.de [139.25.109.167] (may be forged)) by mail2.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o21HHUx9000935; Mon, 1 Mar 2010 18:17:31 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Mon, 1 Mar 2010 18:17:29 +0100 Message-Id: <190fe78f4c8c0a830189a6602d64ea463e0f2be8.1267463833.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: Gleb Natapov , qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH v4 10/10] qemu-kvm: Bring qemu_init_vcpu back home 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 There is no need for the this hack anymore, initialization is now robust against reordering as it doesn't try to write the VCPU state on its own. Signed-off-by: Jan Kiszka --- hw/pc.c | 5 ----- target-i386/helper.c | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index d819fca..0aebae9 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -787,11 +787,6 @@ CPUState *pc_new_cpu(const char *cpu_model) } else { qemu_register_reset((QEMUResetHandler*)cpu_reset, env); } - - /* kvm needs this to run after the apic is initialized. Otherwise, - * it can access invalid state and crash. - */ - qemu_init_vcpu(env); return env; } diff --git a/target-i386/helper.c b/target-i386/helper.c index 73381e2..e595a3e 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -2285,6 +2285,8 @@ CPUX86State *cpu_x86_init(const char *cpu_model) } mce_init(env); + qemu_init_vcpu(env); + return env; }