From owner-freebsd-xen@FreeBSD.ORG Tue Dec 24 11:25:27 2013 Return-Path: Delivered-To: freebsd-xen@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 51B202CD; Tue, 24 Dec 2013 11:25:27 +0000 (UTC) Received: from SMTP.CITRIX.COM (smtp.citrix.com [66.165.176.89]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CBAA916EC; Tue, 24 Dec 2013 11:25:25 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.95,542,1384300800"; d="scan'208";a="87482286" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 24 Dec 2013 11:25:23 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.2.342.4; Tue, 24 Dec 2013 06:25:22 -0500 Received: from gateway-cbg.eng.citrite.net ([10.80.16.17] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1VvQ4G-0007qS-Ns; Tue, 24 Dec 2013 11:22:32 +0000 From: Roger Pau Monne To: , , , , , , Subject: [PATCH RFC 12/13] mca: disable cmc enable on Xen PV Date: Tue, 24 Dec 2013 12:21:01 +0100 Message-ID: <1387884062-41154-13-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) In-Reply-To: <1387884062-41154-1-git-send-email-roger.pau@citrix.com> References: <1387884062-41154-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA1 X-BeenThere: freebsd-xen@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Discussion of the freebsd port to xen - implementation and usage List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Dec 2013 11:25:27 -0000 Xen PV guests doesn't have a lapic, so disable the lapic call in mca initialization. --- sys/x86/x86/mca.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c index f1369cd..e9d2c1d 100644 --- a/sys/x86/x86/mca.c +++ b/sys/x86/x86/mca.c @@ -897,7 +897,7 @@ _mca_init(int boot) } #ifdef DEV_APIC - if (PCPU_GET(cmci_mask) != 0 && boot) + if (PCPU_GET(cmci_mask) != 0 && boot && !lapic_disabled) lapic_enable_cmc(); #endif } -- 1.7.7.5 (Apple Git-26)