summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorDylan Reid <dgreid@chromium.org>2018-05-23 16:45:29 -0700
committerchrome-bot <chrome-bot@chromium.org>2018-07-23 21:05:03 -0700
commita697d31fc697a6f02489f11d58d23cb2380d4013 (patch)
treecabc0d5fe9ca09794130746814023c055a2d5adb /src
parentb847858e66d58a3bf7506f43f1a22781014a527e (diff)
downloadcrosvm-a697d31fc697a6f02489f11d58d23cb2380d4013.tar
crosvm-a697d31fc697a6f02489f11d58d23cb2380d4013.tar.gz
crosvm-a697d31fc697a6f02489f11d58d23cb2380d4013.tar.bz2
crosvm-a697d31fc697a6f02489f11d58d23cb2380d4013.tar.lz
crosvm-a697d31fc697a6f02489f11d58d23cb2380d4013.tar.xz
crosvm-a697d31fc697a6f02489f11d58d23cb2380d4013.tar.zst
crosvm-a697d31fc697a6f02489f11d58d23cb2380d4013.zip
mptable: Add ability to allocate pci interrupts
PCI devices will require interrupts, allow this by passing a vector of
IRQs to the mptable so the guest kernel can find the IRQs.

Change-Id: I9fa8a2ed0a34089e631441570521082ffde9c4ef
Reviewed-on: https://chromium-review.googlesource.com/1072578
Commit-Ready: Dylan Reid <dgreid@chromium.org>
Tested-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Diffstat (limited to 'src')
-rw-r--r--src/linux.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/linux.rs b/src/linux.rs
index 7e7f2b0..46ea35b 100644
--- a/src/linux.rs
+++ b/src/linux.rs
@@ -910,8 +910,8 @@ pub fn run_config(cfg: Config) -> Result<()> {
     // kernel loading
     Arch::load_kernel(&mem, &mut kernel_image).map_err(|e| Error::LoadKernel(e))?;
     Arch::setup_system_memory(&mem, mem_size as u64, vcpu_count,
-                              &CString::new(cmdline).unwrap()).
-        map_err(|e| Error::SetupSystemMemory(e))?;
+                              &CString::new(cmdline).unwrap(), Vec::new())
+        .map_err(|e| Error::SetupSystemMemory(e))?;
 
     setup_vcpu_signal_handler()?;
     for (cpu_id, vcpu) in vcpus.into_iter().enumerate() {