From 47fdc8e5a029693ee67fea3f14f174c6e30082ca Mon Sep 17 00:00:00 2001
From: Chirantan Ekbote <chirantan@chromium.org>
Date: Fri, 25 Jun 2021 18:29:23 +0900
Subject: [PATCH] gpu: Remove unused parameter

BUG=b:179755651
TEST=cargo test

Change-Id: Ifc5e2619cec690ccfc8a5f03dee441fabb3d2be8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2987593
Auto-Submit: Chirantan Ekbote <chirantan@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Chirantan Ekbote <chirantan@chromium.org>
Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
---
 devices/src/virtio/gpu/mod.rs | 11 ++---------
 src/linux.rs                  |  3 ---
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/devices/src/virtio/gpu/mod.rs b/devices/src/virtio/gpu/mod.rs
index 49dac641df..fd4aaea575 100644
--- a/devices/src/virtio/gpu/mod.rs
+++ b/devices/src/virtio/gpu/mod.rs
@@ -20,8 +20,8 @@ use std::thread;
 use std::time::Duration;
 
 use base::{
-    debug, error, warn, AsRawDescriptor, AsRawDescriptors, Event, ExternalMapping, PollToken,
-    RawDescriptor, Tube, WaitContext,
+    debug, error, warn, AsRawDescriptor, Event, ExternalMapping, PollToken, RawDescriptor, Tube,
+    WaitContext,
 };
 
 use data_model::*;
@@ -969,7 +969,6 @@ pub struct Gpu {
     external_blob: bool,
     rutabaga_component: RutabagaComponentType,
     base_features: u64,
-    mem: GuestMemory,
     udmabuf: bool,
 }
 
@@ -985,7 +984,6 @@ impl Gpu {
         external_blob: bool,
         base_features: u64,
         channels: BTreeMap<String, PathBuf>,
-        mem: GuestMemory,
     ) -> Gpu {
         let virglrenderer_flags = VirglRendererFlags::new()
             .use_egl(gpu_parameters.renderer_use_egl)
@@ -1055,7 +1053,6 @@ impl Gpu {
             external_blob,
             rutabaga_component: component,
             base_features,
-            mem,
             udmabuf: gpu_parameters.udmabuf,
         }
     }
@@ -1122,10 +1119,6 @@ impl VirtioDevice for Gpu {
             keep_rds.push(libc::STDERR_FILENO);
         }
 
-        if self.udmabuf {
-            keep_rds.append(&mut self.mem.as_raw_descriptors());
-        }
-
         if let Some(ref gpu_device_tube) = self.gpu_device_tube {
             keep_rds.push(gpu_device_tube.as_raw_descriptor());
         }
diff --git a/src/linux.rs b/src/linux.rs
index ac131e85a7..7bd606a5f6 100644
--- a/src/linux.rs
+++ b/src/linux.rs
@@ -642,7 +642,6 @@ fn create_gpu_device(
     x_display: Option<String>,
     event_devices: Vec<EventDevice>,
     map_request: Arc<Mutex<Option<ExternalMapping>>>,
-    mem: &GuestMemory,
 ) -> DeviceResult {
     let mut display_backends = vec![
         virtio::DisplayBackend::X(x_display),
@@ -674,7 +673,6 @@ fn create_gpu_device(
         cfg.sandbox,
         virtio::base_features(cfg.protected_vm),
         cfg.wayland_socket_paths.clone(),
-        mem.clone(),
     );
 
     let jail = match simple_jail(&cfg, "gpu_device")? {
@@ -1396,7 +1394,6 @@ fn create_virtio_devices(
                 cfg.x_display.clone(),
                 event_devices,
                 map_request,
-                vm.get_memory(),
             )?);
         }
     }