diff options
| -rw-r--r-- | devices/src/virtio/descriptor_utils.rs | 4 | ||||
| -rw-r--r-- | sys_util/src/guest_memory.rs | 4 | ||||
| -rw-r--r-- | sys_util/src/mmap.rs | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/devices/src/virtio/descriptor_utils.rs b/devices/src/virtio/descriptor_utils.rs index 0656c06..141c4bf 100644 --- a/devices/src/virtio/descriptor_utils.rs +++ b/devices/src/virtio/descriptor_utils.rs @@ -179,7 +179,7 @@ impl<'a> Reader<'a> { /// Returns the number of bytes read from the descriptor chain buffer. /// The number of bytes read can be less than `count` if there isn't /// enough data in the descriptor chain buffer. - pub fn read_to(&mut self, dst: &AsRawFd, count: usize) -> Result<usize> { + pub fn read_to(&mut self, dst: &dyn AsRawFd, count: usize) -> Result<usize> { let mem = self.mem; self.buffer .consume(|addr, count| mem.write_from_memory(addr, dst, count), count) @@ -269,7 +269,7 @@ impl<'a> Writer<'a> { /// Returns the number of bytes written to the descriptor chain buffer. /// The number of bytes written can be less than `count` if /// there isn't enough data in the descriptor chain buffer. - pub fn write_from(&mut self, src: &AsRawFd, count: usize) -> Result<usize> { + pub fn write_from(&mut self, src: &dyn AsRawFd, count: usize) -> Result<usize> { let mem = self.mem; self.buffer .consume(|addr, count| mem.read_to_memory(addr, src, count), count) diff --git a/sys_util/src/guest_memory.rs b/sys_util/src/guest_memory.rs index 40ae925..c3ea816 100644 --- a/sys_util/src/guest_memory.rs +++ b/sys_util/src/guest_memory.rs @@ -460,7 +460,7 @@ impl GuestMemory { pub fn read_to_memory( &self, guest_addr: GuestAddress, - src: &AsRawFd, + src: &dyn AsRawFd, count: usize, ) -> Result<()> { self.do_in_region(guest_addr, move |mapping, offset| { @@ -497,7 +497,7 @@ impl GuestMemory { pub fn write_from_memory( &self, guest_addr: GuestAddress, - dst: &AsRawFd, + dst: &dyn AsRawFd, count: usize, ) -> Result<()> { self.do_in_region(guest_addr, move |mapping, offset| { diff --git a/sys_util/src/mmap.rs b/sys_util/src/mmap.rs index 3d1e577..18414d5 100644 --- a/sys_util/src/mmap.rs +++ b/sys_util/src/mmap.rs @@ -248,7 +248,7 @@ impl MemoryMapping { size: usize, prot: c_int, flags: c_int, - fd: Option<(&AsRawFd, usize)>, + fd: Option<(&dyn AsRawFd, usize)>, ) -> Result<MemoryMapping> { let mut flags = flags; // If addr is provided, set the FIXED flag, and validate addr alignment @@ -459,7 +459,7 @@ impl MemoryMapping { pub fn read_to_memory( &self, mut mem_offset: usize, - src: &AsRawFd, + src: &dyn AsRawFd, mut count: usize, ) -> Result<()> { self.range_end(mem_offset, count) @@ -518,7 +518,7 @@ impl MemoryMapping { pub fn write_from_memory( &self, mut mem_offset: usize, - dst: &AsRawFd, + dst: &dyn AsRawFd, mut count: usize, ) -> Result<()> { self.range_end(mem_offset, count) @@ -715,7 +715,7 @@ impl MemoryMappingArena { offset: usize, size: usize, prot: Protection, - fd: Option<(&AsRawFd, usize)>, + fd: Option<(&dyn AsRawFd, usize)>, ) -> Result<()> { self.validate_range(offset, size)?; |