summary refs log tree commit diff
path: root/src/main.rs
diff options
context:
space:
mode:
authorSlava Malyugin <slavamn@google.com>2017-11-15 11:37:44 -0800
committerchrome-bot <chrome-bot@chromium.org>2017-11-15 20:21:05 -0800
commit15ac8732184ad1f8900ae815ddfb26663d437aec (patch)
tree5599470f21187feb296c1476efb8004490cdf184 /src/main.rs
parent4e7feeec3eb14d12e32e1a22db23074bb448ce30 (diff)
downloadcrosvm-15ac8732184ad1f8900ae815ddfb26663d437aec.tar
crosvm-15ac8732184ad1f8900ae815ddfb26663d437aec.tar.gz
crosvm-15ac8732184ad1f8900ae815ddfb26663d437aec.tar.bz2
crosvm-15ac8732184ad1f8900ae815ddfb26663d437aec.tar.lz
crosvm-15ac8732184ad1f8900ae815ddfb26663d437aec.tar.xz
crosvm-15ac8732184ad1f8900ae815ddfb26663d437aec.tar.zst
crosvm-15ac8732184ad1f8900ae815ddfb26663d437aec.zip
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 <slavamn@google.com>
Tested-by: Slava Malyugin <slavamn@google.com>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs2
1 files changed, 1 insertions, 1 deletions
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);