From 15ac8732184ad1f8900ae815ddfb26663d437aec Mon Sep 17 00:00:00 2001 From: Slava Malyugin Date: Wed, 15 Nov 2017 11:37:44 -0800 Subject: crosvm: fix MPTable, enable apic The mptable inherited from kvmtool had some missing pieces. On top of that, crosvm does not use KVM_SET_GSI_ROUTING. The addresses makes mptable match the default routing in host kernel and removes "noapic". TEST=cargo build (--release). tatl boot tested on 4.4.0 and 4.4.9 Change-Id: Ibc55abf245cd9d8fca601da204d5a189321c09c7 Reviewed-on: https://chromium-review.googlesource.com/772820 Commit-Ready: Slava Malyugin Tested-by: Slava Malyugin Reviewed-by: Dylan Reid --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index da1a3ad..2503dd8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -306,7 +306,7 @@ fn run_config(cfg: Config) -> Result<()> { let mut cmdline = kernel_cmdline::Cmdline::new(CMDLINE_MAX_SIZE); cmdline - .insert_str("console=ttyS0 noapic noacpi reboot=k panic=1 pci=off") + .insert_str("console=ttyS0 noacpi reboot=k panic=1 pci=off") .unwrap(); let mut device_manager = DeviceManager::new(guest_mem.clone(), 0x1000, 0xd0000000, 5); -- cgit 1.4.1