1 files changed, 5 insertions, 8 deletions
diff --git a/devices/src/virtio/wl.rs b/devices/src/virtio/wl.rs
index 3a5ecee..6fefd51 100644
--- a/devices/src/virtio/wl.rs
+++ b/devices/src/virtio/wl.rs
@@ -28,7 +28,6 @@
 //! the virtio queue, and routing messages in and out of `WlState`. Possible events include the kill
 //! event, available descriptors on the `in` or `out` queue, and incoming data on any vfd's socket.
 
-use std::cell::RefCell;
 use std::collections::btree_map::Entry;
 use std::collections::{BTreeMap as Map, BTreeSet as Set, VecDeque};
 use std::convert::From;
@@ -327,21 +326,19 @@ impl From<VolatileMemoryError> for WlError {
 
 #[derive(Clone)]
 struct VmRequester {
-    inner: Rc<RefCell<VmMemoryControlRequestSocket>>,
+    vm_socket: Rc<VmMemoryControlRequestSocket>,
 }
 
 impl VmRequester {
     fn new(vm_socket: VmMemoryControlRequestSocket) -> VmRequester {
         VmRequester {
-            inner: Rc::new(RefCell::new(vm_socket)),
+            vm_socket: Rc::new(vm_socket),
         }
     }
 
     fn request(&self, request: VmMemoryRequest) -> WlResult<VmMemoryResponse> {
-        let mut inner = self.inner.borrow_mut();
-        let vm_socket = &mut *inner;
-        vm_socket.send(&request).map_err(WlError::VmControl)?;
-        vm_socket.recv().map_err(WlError::VmControl)
+        self.vm_socket.send(&request).map_err(WlError::VmControl)?;
+        self.vm_socket.recv().map_err(WlError::VmControl)
     }
 }
 
@@ -1252,7 +1249,7 @@ impl WlState {
                 self.new_context(ctrl.id.into(), name)
             }
             op_type => {
-                warn!("unexpected command {}", op_type);
+                warn!("unexpected command {:#x}", op_type);
                 Ok(WlResp::InvalidCommand)
             }
         }