diff options
author | royger <royger@FreeBSD.org> | 2014-08-04 08:56:20 +0000 |
---|---|---|
committer | royger <royger@FreeBSD.org> | 2014-08-04 08:56:20 +0000 |
commit | 668dd4b0cbdb6a2f5f99e82eb2a9bae2988794aa (patch) | |
tree | 6c8a2890b364ac80e14d012f8bf6a114a15516f0 | |
parent | 1bfb01ea6b43d54c4461f0448945f687f756d0fc (diff) | |
download | FreeBSD-src-668dd4b0cbdb6a2f5f99e82eb2a9bae2988794aa.zip FreeBSD-src-668dd4b0cbdb6a2f5f99e82eb2a9bae2988794aa.tar.gz |
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.
-rw-r--r-- | sys/x86/acpica/madt.c | 2 | ||||
-rw-r--r-- | sys/x86/xen/pvcpu_enum.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c index 8960d95..99eaafc 100644 --- a/sys/x86/acpica/madt.c +++ b/sys/x86/acpica/madt.c @@ -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); } /* diff --git a/sys/x86/xen/pvcpu_enum.c b/sys/x86/xen/pvcpu_enum.c index df092cb..30e6803 100644 --- a/sys/x86/xen/pvcpu_enum.c +++ b/sys/x86/xen/pvcpu_enum.c @@ -67,7 +67,7 @@ static struct apic_enumerator xenpv_enumerator = { static int xenpv_probe(void) { - return (-100); + return (0); } /* |