summary refs log tree commit diff
diff options
context:
space:
mode:
authorLingfeng Yang <lfy@google.com>2020-03-13 09:06:50 -0700
committerCommit Bot <commit-bot@chromium.org>2020-03-26 02:52:58 +0000
commit22964eab8874d41cf0eadf03dfeb1ffb653283e5 (patch)
treea18d95e67544837baa982695eef5c17ba9abf096
parent45a94bedaea17d8ae95e860b8a4beb2e465c187e (diff)
downloadcrosvm-22964eab8874d41cf0eadf03dfeb1ffb653283e5.tar
crosvm-22964eab8874d41cf0eadf03dfeb1ffb653283e5.tar.gz
crosvm-22964eab8874d41cf0eadf03dfeb1ffb653283e5.tar.bz2
crosvm-22964eab8874d41cf0eadf03dfeb1ffb653283e5.tar.lz
crosvm-22964eab8874d41cf0eadf03dfeb1ffb653283e5.tar.xz
crosvm-22964eab8874d41cf0eadf03dfeb1ffb653283e5.tar.zst
crosvm-22964eab8874d41cf0eadf03dfeb1ffb653283e5.zip
gfxstream: fix build
API for export_resource changed

Bug: b/146066070
Change-Id: I614880704658bbe7aae2f7ad8b10c76555d99c1f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2102760
Tested-by: Lingfeng Yang <lfy@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Lingfeng Yang <lfy@google.com>
Reviewed-by: Jason Macnak <natsu@google.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
-rw-r--r--devices/src/virtio/gpu/virtio_gfxstream_backend.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/devices/src/virtio/gpu/virtio_gfxstream_backend.rs b/devices/src/virtio/gpu/virtio_gfxstream_backend.rs
index aa02e15..2a49da8 100644
--- a/devices/src/virtio/gpu/virtio_gfxstream_backend.rs
+++ b/devices/src/virtio/gpu/virtio_gfxstream_backend.rs
@@ -10,7 +10,6 @@
 use std::cell::RefCell;
 use std::collections::btree_map::Entry;
 use std::collections::BTreeMap as Map;
-use std::fs::File;
 use std::mem::transmute;
 use std::os::raw::{c_char, c_int, c_uchar, c_uint, c_void};
 use std::panic;
@@ -27,6 +26,7 @@ use vm_control::VmMemoryControlRequestSocket;
 use super::protocol::GpuResponse;
 pub use super::virtio_backend::{VirtioBackend, VirtioResource};
 use crate::virtio::gpu::{Backend, DisplayBackend, VIRTIO_F_VERSION_1, VIRTIO_GPU_F_VIRGL};
+use crate::virtio::resource_bridge::ResourceResponse;
 
 // C definitions related to gfxstream
 // In gfxstream, only write_fence is used
@@ -340,8 +340,8 @@ impl Backend for VirtioGfxStreamBackend {
     }
 
     /// If supported, export the resource with the given id to a file.
-    fn export_resource(&mut self, _id: u32) -> Option<File> {
-        None
+    fn export_resource(&mut self, _id: u32) -> ResourceResponse {
+        ResourceResponse::Invalid
     }
 
     /// Creates a fence with the given id that can be used to determine when the previous command