diff options
| author | Cody Schuffelen <schuffelen@google.com> | 2019-07-08 16:30:33 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-30 16:08:58 +0000 |
| commit | 30c5a9ef0b2ca7edeed36cc7ff8235a8d75e1595 (patch) | |
| tree | a35764ee3991ac8c4559449c9380b12edd30f6bf /devices/src | |
| parent | 7d533e5952b6bae600441e1183964d335a41d6fe (diff) | |
| download | crosvm-30c5a9ef0b2ca7edeed36cc7ff8235a8d75e1595.tar crosvm-30c5a9ef0b2ca7edeed36cc7ff8235a8d75e1595.tar.gz crosvm-30c5a9ef0b2ca7edeed36cc7ff8235a8d75e1595.tar.bz2 crosvm-30c5a9ef0b2ca7edeed36cc7ff8235a8d75e1595.tar.lz crosvm-30c5a9ef0b2ca7edeed36cc7ff8235a8d75e1595.tar.xz crosvm-30c5a9ef0b2ca7edeed36cc7ff8235a8d75e1595.tar.zst crosvm-30c5a9ef0b2ca7edeed36cc7ff8235a8d75e1595.zip | |
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>
Diffstat (limited to 'devices/src')
| -rw-r--r-- | devices/src/virtio/block.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/devices/src/virtio/block.rs b/devices/src/virtio/block.rs index 7a728d7..3662bd9 100644 --- a/devices/src/virtio/block.rs +++ b/devices/src/virtio/block.rs @@ -707,7 +707,7 @@ impl VirtioDevice for Block { let mut keep_fds = Vec::new(); if let Some(disk_image) = &self.disk_image { - keep_fds.push(disk_image.as_raw_fd()); + keep_fds.extend(disk_image.as_raw_fds()); } if let Some(control_socket) = &self.control_socket { |