brl/pH
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use MemoryManager rather than GuestRam

Browse Source
This commit is contained in:
Bruce Leidl 2019-09-11 16:29:26 -04:00
parent 9bf3f84fae
commit 1f7aadff12
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rust/src/devices/virtio_9p/mod.rs
View File

@ -3,7 +3,7 @@ use std::thread;
use std::path::{Path,PathBuf}; use std::path::{Path,PathBuf};
use crate::memory::GuestRam; use crate::memory::{GuestRam, MemoryManager};
use crate::virtio::{self,VirtioBus,VirtioDeviceOps, VirtQueue}; use crate::virtio::{self,VirtioBus,VirtioDeviceOps, VirtQueue};
use crate::vm::Result; use crate::vm::Result;
@ -71,11 +71,12 @@ impl VirtioDeviceOps for VirtioP9 {
} }
fn start(&mut self, memory: GuestRam, mut queues: Vec<VirtQueue>) { fn start(&mut self, memory: &MemoryManager, mut queues: Vec<VirtQueue>) {
let vq = queues.pop().unwrap(); let vq = queues.pop().unwrap();
let root_dir = self.root_dir.clone(); let root_dir = self.root_dir.clone();
let init_path = self.init_path.clone(); let init_path = self.init_path.clone();
thread::spawn(|| run_device(memory, vq, root_dir, init_path)); let ram = memory.guest_ram().clone();
thread::spawn(|| run_device(ram, vq, root_dir, init_path));
} }
} }