svn commit: r269511 - in head/sys/x86: acpica xen

[Roger Pau Monné]

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);
 }
 
 /*