summary refs log tree commit diff
path: root/devices/src/virtio
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-03-13 22:33:19 +0000
committerAlyssa Ross <hi@alyssa.is>2020-06-15 09:36:36 +0000
commit135afeb7e4934d744542dad725c5996d6bcd70dc (patch)
tree429d0a50f12f67b34c249570736523b2ea3b9d45 /devices/src/virtio
parenta5dc93df5b96728226bd3fcbc4298e6fb54f146d (diff)
downloadcrosvm-135afeb7e4934d744542dad725c5996d6bcd70dc.tar
crosvm-135afeb7e4934d744542dad725c5996d6bcd70dc.tar.gz
crosvm-135afeb7e4934d744542dad725c5996d6bcd70dc.tar.bz2
crosvm-135afeb7e4934d744542dad725c5996d6bcd70dc.tar.lz
crosvm-135afeb7e4934d744542dad725c5996d6bcd70dc.tar.xz
crosvm-135afeb7e4934d744542dad725c5996d6bcd70dc.tar.zst
crosvm-135afeb7e4934d744542dad725c5996d6bcd70dc.zip
send MemoryParams in create
Diffstat (limited to 'devices/src/virtio')
-rw-r--r--devices/src/virtio/controller.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/devices/src/virtio/controller.rs b/devices/src/virtio/controller.rs
index 7b1b2cc..5d5d76a 100644
--- a/devices/src/virtio/controller.rs
+++ b/devices/src/virtio/controller.rs
@@ -35,6 +35,7 @@ use std::thread;
 
 use super::resource_bridge::*;
 use super::{Interrupt, InterruptProxyEvent, Queue, VirtioDevice, TYPE_WL, VIRTIO_F_VERSION_1};
+use crate::MemoryParams;
 use vm_control::{MaybeOwnedFd, VmMemoryControlRequestSocket};
 
 use msg_socket::{MsgOnSocket, MsgReceiver, MsgSocket};
@@ -48,6 +49,7 @@ pub enum MsgOnSocketRequest {
         // wayland_paths: Map<String, PathBuf>,
         vm_socket: MaybeOwnedFd<UnixSeqpacket>,
         // resource_bridge: Option<ResourceRequestSocket>,
+        memory_params: MemoryParams,
     },
     Activate {
         shm: MaybeOwnedFd<SharedMemory>,
@@ -223,12 +225,14 @@ impl Controller {
         wayland_paths: Map<String, PathBuf>,
         vm_socket: VmMemoryControlRequestSocket,
         resource_bridge: Option<ResourceRequestSocket>,
+        memory_params: MemoryParams,
         socket: Socket,
     ) -> Result<Controller, poly_msg_socket::Error> {
         socket.send(MsgOnSocketRequest::Create {
             // wayland_paths,
             vm_socket: MaybeOwnedFd::new_borrowed(&vm_socket),
             // resource_bridge,
+            memory_params,
         })?;
 
         Ok(Controller {