Replace "AsRawFd" with "AsRawFds" for disks.

This supports virtio disks that depend on multiple file descriptors. All
of the file descriptors are passed to the jail when relevant.

Bug: b/133432409
Change-Id: Idf2e24cd2984c0d12a47a523c13d24c1ba8d173e
Signed-off-by: Cody Schuffelen <schuffelen@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1691761
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/disk/src/disk.rs b/disk/src/disk.rs
index c9ce1b3..9f1914d 100644
--- a/disk/src/disk.rs
+++ b/disk/src/disk.rs
@@ -6,12 +6,13 @@ use std::cmp::min;
 use std::fmt::{self, Display};
 use std::fs::File;
 use std::io::{self, Read, Seek, SeekFrom, Write};
-use std::os::unix::io::AsRawFd;
 
 use libc::EINVAL;
 use qcow::{QcowFile, QCOW_MAGIC};
 use remain::sorted;
-use sys_util::{FileReadWriteVolatile, FileSetLen, FileSync, PunchHole, SeekHole, WriteZeroes};
+use sys_util::{
+    AsRawFds, FileReadWriteVolatile, FileSetLen, FileSync, PunchHole, SeekHole, WriteZeroes,
+};
 
 #[sorted]
 #[derive(Debug)]
@@ -30,7 +31,7 @@ pub type Result<T> = std::result::Result<T, Error>;
 
 /// The prerequisites necessary to support a block device.
 pub trait DiskFile:
-    FileSetLen + FileSync + FileReadWriteVolatile + PunchHole + Seek + WriteZeroes + Send + AsRawFd
+    FileSetLen + FileSync + FileReadWriteVolatile + PunchHole + Seek + WriteZeroes + Send + AsRawFds
 {
 }
 impl<
@@ -41,7 +42,7 @@ impl<
             + Seek
             + WriteZeroes
             + Send
-            + AsRawFd,
+            + AsRawFds,
     > DiskFile for D
 {
 }