From patchwork Mon Mar 1 18:10:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 83018 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o21IAuvE022055 for ; Mon, 1 Mar 2010 18:10:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751054Ab0CASKz (ORCPT ); Mon, 1 Mar 2010 13:10:55 -0500 Received: from thoth.sbs.de ([192.35.17.2]:23771 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752963Ab0CASKy (ORCPT ); Mon, 1 Mar 2010 13:10:54 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id o21IAXt6020090; Mon, 1 Mar 2010 19:10:34 +0100 Received: from localhost.localdomain (mchn012c.mchp.siemens.de [139.25.109.167] (may be forged)) by mail1.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o21IAXSV002877; Mon, 1 Mar 2010 19:10:33 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org Subject: [PATCH 4/4] x86: Extend validity of bsp_to_cpu Date: Mon, 1 Mar 2010 19:10:32 +0100 Message-Id: X-Mailer: git-send-email 1.6.0.2 In-Reply-To: References: In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 01 Mar 2010 18:10:56 +0000 (UTC) diff --git a/hw/pc.c b/hw/pc.c index bdc297f..e50a488 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -760,7 +760,8 @@ static void pc_init_ne2k_isa(NICInfo *nd) int cpu_is_bsp(CPUState *env) { - return env->cpuid_apic_id == 0; + /* We hard-wire the BSP to the first CPU. */ + return env->cpu_index == 0; } static CPUState *pc_new_cpu(const char *cpu_model)