diff --git a/disk/src/disk.rs b/disk/src/disk.rs index 60e7e016e8..3956b9980a 100644 --- a/disk/src/disk.rs +++ b/disk/src/disk.rs @@ -25,10 +25,10 @@ use base::FileSync; use base::PunchHole; use base::WriteZeroesAt; use cros_async::AllocateMode; +use cros_async::BackingMemory; use cros_async::Executor; use cros_async::IoSourceExt; use thiserror::Error as ThisError; -use vm_memory::GuestMemory; mod qcow; pub use qcow::QcowFile; @@ -318,7 +318,7 @@ pub trait AsyncDisk: DiskGetLen + FileSetLen + FileAllocate { async fn read_to_mem<'a>( &self, file_offset: u64, - mem: Arc, + mem: Arc, mem_offsets: &'a [cros_async::MemRegion], ) -> Result; @@ -326,7 +326,7 @@ pub trait AsyncDisk: DiskGetLen + FileSetLen + FileAllocate { async fn write_from_mem<'a>( &self, file_offset: u64, - mem: Arc, + mem: Arc, mem_offsets: &'a [cros_async::MemRegion], ) -> Result; @@ -381,7 +381,7 @@ impl AsyncDisk for SingleFileDisk { async fn read_to_mem<'a>( &self, file_offset: u64, - mem: Arc, + mem: Arc, mem_offsets: &'a [cros_async::MemRegion], ) -> Result { self.inner @@ -393,7 +393,7 @@ impl AsyncDisk for SingleFileDisk { async fn write_from_mem<'a>( &self, file_offset: u64, - mem: Arc, + mem: Arc, mem_offsets: &'a [cros_async::MemRegion], ) -> Result { self.inner diff --git a/disk/src/sys/unix.rs b/disk/src/sys/unix.rs index 0b6aac387b..ec75eb723f 100644 --- a/disk/src/sys/unix.rs +++ b/disk/src/sys/unix.rs @@ -31,11 +31,7 @@ mod tests { let f = File::open("/dev/zero").unwrap(); let async_file = SingleFileDisk::new(f, ex).unwrap(); let result = async_file - .read_to_mem( - 0, - Arc::clone(&guest_mem), - &[MemRegion { offset: 0, len: 48 }], - ) + .read_to_mem(0, guest_mem, &[MemRegion { offset: 0, len: 48 }]) .await; assert_eq!(48, result.unwrap()); } @@ -51,11 +47,7 @@ mod tests { let f = OpenOptions::new().write(true).open("/dev/null").unwrap(); let async_file = SingleFileDisk::new(f, ex).unwrap(); let result = async_file - .write_from_mem( - 0, - Arc::clone(&guest_mem), - &[MemRegion { offset: 0, len: 48 }], - ) + .write_from_mem(0, guest_mem, &[MemRegion { offset: 0, len: 48 }]) .await; assert_eq!(48, result.unwrap()); }