summary refs log tree commit diff
path: root/devices/src/virtio/gpu
diff options
context:
space:
mode:
authorDaniel Verkamp <dverkamp@chromium.org>2020-05-26 10:10:18 -0700
committerCommit Bot <commit-bot@chromium.org>2020-05-27 04:46:31 +0000
commitddd8180a13d0f389d533026c667c8fe57ee5e8ee (patch)
treeb4f6ec92d3a4e698275d23ed35eaa25e01d96f64 /devices/src/virtio/gpu
parentf0fa242b92463d8b64845f247ed02418da7ab7b7 (diff)
downloadcrosvm-ddd8180a13d0f389d533026c667c8fe57ee5e8ee.tar
crosvm-ddd8180a13d0f389d533026c667c8fe57ee5e8ee.tar.gz
crosvm-ddd8180a13d0f389d533026c667c8fe57ee5e8ee.tar.bz2
crosvm-ddd8180a13d0f389d533026c667c8fe57ee5e8ee.tar.lz
crosvm-ddd8180a13d0f389d533026c667c8fe57ee5e8ee.tar.xz
crosvm-ddd8180a13d0f389d533026c667c8fe57ee5e8ee.tar.zst
crosvm-ddd8180a13d0f389d533026c667c8fe57ee5e8ee.zip
Fix VolatileSlice calls in all modules
The VolatileSlice API changed, but some callers were not updated to
match.  Fix them up so that builds with additional features enabled
(e.g. kokoro) pass again.

BUG=None
TEST=cargo test -p disk --features=composite-disk
TEST=docker/wrapped_smoke_test.sh

Change-Id: I97b3cd04549af30b7dc1515245f025d9439669bc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2216399
Tested-by: Daniel Verkamp <dverkamp@chromium.org>
Auto-Submit: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Diffstat (limited to 'devices/src/virtio/gpu')
-rw-r--r--devices/src/virtio/gpu/virtio_gfxstream_backend.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/devices/src/virtio/gpu/virtio_gfxstream_backend.rs b/devices/src/virtio/gpu/virtio_gfxstream_backend.rs
index d8ef793..b2a9fb7 100644
--- a/devices/src/virtio/gpu/virtio_gfxstream_backend.rs
+++ b/devices/src/virtio/gpu/virtio_gfxstream_backend.rs
@@ -16,7 +16,6 @@ use std::panic;
 use std::rc::Rc;
 use std::usize;
 
-use data_model::*;
 use gpu_display::*;
 use gpu_renderer::RendererFlags;
 use resources::Alloc;
@@ -467,7 +466,7 @@ impl Backend for VirtioGfxStreamBackend {
         let mut backing_iovecs: Vec<iovec> = Vec::new();
 
         for (addr, len) in vecs {
-            let slice = mem.get_slice(addr.offset(), len as u64).unwrap();
+            let slice = mem.get_slice_at_addr(addr, len).unwrap();
             backing_iovecs.push(iovec {
                 iov_base: slice.as_ptr() as *mut c_void,
                 iov_len: len as usize,