arch, vmm: Don't build mptable when using ACPI

Use the ACPI feature to control whether to build the mptable. This is
necessary as the mptable and ACPI RSDP table can easily overwrite each
other leading to it failing to boot.

TEST=Compile with default features and see that --cpus boot=48 now
works, try with --no-default-features --features "pci" and observe the
--cpus boot=48 also continues to work.

Fixes: #1132

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
2020-05-11 16:19:32 +01:00
parent 16ac24d8f7
commit b9ba81c30d
3 changed files with 7 additions and 3 deletions

View File

@@ -6,7 +6,7 @@ edition = "2018"
[features]
default = []
acpi = ["acpi_tables","devices/acpi"]
acpi = ["acpi_tables","devices/acpi", "arch/acpi"]
pci_support = ["pci", "vfio", "vm-virtio/pci_support"]
mmio_support = ["vm-virtio/mmio_support"]
cmos = ["devices/cmos"]