From a5dc93df5b96728226bd3fcbc4298e6fb54f146d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 13 Mar 2020 22:21:00 +0000
Subject: move MemoryParams to devices

---
 src/linux.rs | 8 +++++++-
 src/wl.rs    | 5 +++--
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/linux.rs b/src/linux.rs
index 7cb4b9c..f43d48f 100644
--- a/src/linux.rs
+++ b/src/linux.rs
@@ -73,6 +73,8 @@ use aarch64::AArch64 as Arch;
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 use x86_64::X8664arch as Arch;
 
+type MemoryParams = <Arch as LinuxArch>::MemoryParams;
+
 #[sorted]
 #[derive(Debug)]
 pub enum Error {
@@ -1066,6 +1068,7 @@ fn create_console_device(cfg: &Config, param: &SerialParameters) -> DeviceResult
 fn create_virtio_devices(
     cfg: &Config,
     mem: &GuestMemory,
+    mem_params: MemoryParams,
     vm: &mut Vm,
     resources: &mut SystemAllocator,
     _exit_evt: &EventFd,
@@ -1267,6 +1270,7 @@ fn create_virtio_devices(
 fn create_devices(
     cfg: &Config,
     mem: &GuestMemory,
+    mem_params: MemoryParams,
     vm: &mut Vm,
     resources: &mut SystemAllocator,
     exit_evt: &EventFd,
@@ -1281,6 +1285,7 @@ fn create_devices(
     let stubs = create_virtio_devices(
         &cfg,
         mem,
+        mem_params,
         vm,
         resources,
         exit_evt,
@@ -1827,10 +1832,11 @@ pub fn run_config(cfg: Config) -> Result<()> {
         ioapic_device_socket,
         &cfg.serial_parameters,
         simple_jail(&cfg, "serial")?,
-        |mem, vm, sys_allocator, exit_evt| {
+        |mem, mem_params, vm, sys_allocator, exit_evt| {
             create_devices(
                 &cfg,
                 mem,
+                mem_params,
                 vm,
                 sys_allocator,
                 exit_evt,
diff --git a/src/wl.rs b/src/wl.rs
index 333be87..87dcec2 100644
--- a/src/wl.rs
+++ b/src/wl.rs
@@ -4,6 +4,7 @@ use devices::virtio::{
     BincodeRequest, BincodeResponse, InterruptProxy, InterruptProxyEvent, MsgOnSocketRequest,
     MsgOnSocketResponse, VirtioDevice, Wl,
 };
+use devices::MemoryParams;
 use msg_socket::MsgSocket;
 use poly_msg_socket::PolyMsgSocket;
 use std::collections::BTreeMap;
@@ -11,9 +12,9 @@ use std::fs::remove_file;
 use sys_util::{error, net::UnixSeqpacketListener, warn, GuestMemory};
 
 #[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
-pub use aarch64::{arch_memory_regions, MemoryParams};
+pub use aarch64::arch_memory_regions;
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-pub use x86_64::{arch_memory_regions, MemoryParams};
+pub use x86_64::arch_memory_regions;
 
 type Socket =
     PolyMsgSocket<MsgOnSocketResponse, MsgOnSocketRequest, BincodeResponse, BincodeRequest>;
-- 
cgit 1.4.1