From owner-svn-src-head@FreeBSD.ORG  Mon Aug  4 08:56:21 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B3E228FF
 for <svn-src-head@freebsd.org>; Mon,  4 Aug 2014 08:56:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8B26C2809
 for <svn-src-head@freebsd.org>; Mon,  4 Aug 2014 08:56:21 +0000 (UTC)
Received: from royger (uid 1332) (envelope-from royger@FreeBSD.org) id 5c6e
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Mon, 04 Aug 2014 08:56:21 +0000
From: Roger Pau Monné <royger@FreeBSD.org>
Date: Mon, 4 Aug 2014 08:56:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269511 - in head/sys/x86: acpica xen
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53df4ab5.5c6e.5f2645f5@svn.freebsd.org>
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Aug 2014 08:56:21 -0000

Author: royger
Date: Mon Aug  4 08:56:20 2014
New Revision: 269511
URL: http://svnweb.freebsd.org/changeset/base/269511

Log:
  xen: change quality of the MADT ACPI enumerator
  
  Lower the quality of the MADT ACPI enumerator, so on Xen Dom0 we can
  force the usage of the Xen mptable enumerator even when ACPI is
  detected.
  
  This is needed because Xen might restrict the number of vCPUs
  available to Dom0, but the MADT ACPI table parsed in FreeBSD is the
  native one (which enumerates all the CPUs available in the system).
  
  Sponsored by: Citrix Systems R&D
  Reviewed by: gibbs
  
  x86/acpica/madt.c:
   - Lower MADT enumerator quality to -50.
  
  x86/xen/pvcpu_enum.c:
   - Rise Xen PV enumerator to 0.

Modified:
  head/sys/x86/acpica/madt.c
  head/sys/x86/xen/pvcpu_enum.c

Modified: head/sys/x86/acpica/madt.c
==============================================================================
--- head/sys/x86/acpica/madt.c	Mon Aug  4 08:54:34 2014	(r269510)
+++ head/sys/x86/acpica/madt.c	Mon Aug  4 08:56:20 2014	(r269511)
@@ -102,7 +102,7 @@ madt_probe(void)
 	madt_physaddr = acpi_find_table(ACPI_SIG_MADT);
 	if (madt_physaddr == 0)
 		return (ENXIO);
-	return (0);
+	return (-50);
 }
 
 /*

Modified: head/sys/x86/xen/pvcpu_enum.c
==============================================================================
--- head/sys/x86/xen/pvcpu_enum.c	Mon Aug  4 08:54:34 2014	(r269510)
+++ head/sys/x86/xen/pvcpu_enum.c	Mon Aug  4 08:56:20 2014	(r269511)
@@ -67,7 +67,7 @@ static struct apic_enumerator xenpv_enum
 static int
 xenpv_probe(void)
 {
-	return (-100);
+	return (0);
 }
 
 /*