summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Verkamp <dverkamp@chromium.org>2018-11-08 16:12:18 -0800
committerchrome-bot <chrome-bot@chromium.org>2018-11-21 05:52:54 -0800
commit6bfee45131d929a824e0e600920c17f606475b61 (patch)
tree79bd195d73cd1844ffdbe98d740f7ed57a20b40a
parentd32efefb7abcbc356eee84342eb11ca8240acda6 (diff)
downloadcrosvm-6bfee45131d929a824e0e600920c17f606475b61.tar
crosvm-6bfee45131d929a824e0e600920c17f606475b61.tar.gz
crosvm-6bfee45131d929a824e0e600920c17f606475b61.tar.bz2
crosvm-6bfee45131d929a824e0e600920c17f606475b61.tar.lz
crosvm-6bfee45131d929a824e0e600920c17f606475b61.tar.xz
crosvm-6bfee45131d929a824e0e600920c17f606475b61.tar.zst
crosvm-6bfee45131d929a824e0e600920c17f606475b61.zip
wl: silence unused code warnings
When wl-dmabuf is not enabled, rustc complains about unused imports and
enum values.  Add compiler directives to silence the warnings.

BUG=None
TEST='cargo build', 'emerge-nami crosvm'

Change-Id: Ib39735d329f8aa835c0b5842b10bfe78d0e578d9
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1327827
-rw-r--r--devices/src/virtio/wl.rs2
-rw-r--r--resources/src/gpu_allocator.rs1
2 files changed, 3 insertions, 0 deletions
diff --git a/devices/src/virtio/wl.rs b/devices/src/virtio/wl.rs
index 98f741f..9d530bb 100644
--- a/devices/src/virtio/wl.rs
+++ b/devices/src/virtio/wl.rs
@@ -57,6 +57,7 @@ use data_model::VolatileMemoryError;
 use data_model::*;
 
 use msg_socket::{MsgError, MsgReceiver, MsgSender, MsgSocket};
+#[cfg(feature = "wl-dmabuf")]
 use resources::GpuMemoryDesc;
 use sys_util::{
     pipe, round_up_to_page_size, Error, EventFd, FileFlags, GuestAddress, GuestMemory,
@@ -403,6 +404,7 @@ fn encode_resp(desc_mem: VolatileSlice, resp: WlResp) -> WlResult<u32> {
     }
 }
 
+#[allow(dead_code)]
 #[derive(Debug)]
 enum WlError {
     NewAlloc(Error),
diff --git a/resources/src/gpu_allocator.rs b/resources/src/gpu_allocator.rs
index 16dc944..c2f1c20 100644
--- a/resources/src/gpu_allocator.rs
+++ b/resources/src/gpu_allocator.rs
@@ -12,6 +12,7 @@ use gpu_buffer;
 use msg_socket::MsgOnSocket;
 use sys_util;
 
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum GpuAllocatorError {
     OpenGpuBufferDevice,