crosvm: add x-display argument for choosing the X11 gpu display

TEST=cargo run -- run --gpu --x-display :0
BUG=None

Change-Id: I76b4b33a6b14cb6fad322ffa95f00cce976f81a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1670550
Reviewed-by: Zach Reizner <zachr@chromium.org>
Commit-Queue: Zach Reizner <zachr@chromium.org>
Tested-by: Zach Reizner <zachr@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>

1 files changed, 5 insertions, 7 deletions

diff --git a/devices/src/virtio/gpu/mod.rs b/devices/src/virtio/gpu/mod.rs
index c81afa5..2c09761 100644
--- a/devices/src/virtio/gpu/mod.rs
+++ b/devices/src/virtio/gpu/mod.rs
@@ -11,7 +11,7 @@ use std::i64;
 use std::mem::{self, size_of};
 use std::num::NonZeroU8;
 use std::os::unix::io::{AsRawFd, RawFd};
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::rc::Rc;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
@@ -711,22 +711,20 @@ pub struct Gpu {
 }
 
 impl Gpu {
-    pub fn new<P: AsRef<Path>>(
+    pub fn new(
         exit_evt: EventFd,
         gpu_device_socket: Option<VmMemoryControlRequestSocket>,
+        num_scanouts: NonZeroU8,
         resource_bridges: Vec<ResourceResponseSocket>,
-        wayland_socket_path: P,
+        display_backends: Vec<DisplayBackend>,
     ) -> Gpu {
-        let display_backends = vec![DisplayBackend::Wayland(Some(
-            wayland_socket_path.as_ref().to_owned(),
-        ))];
         Gpu {
             config_event: false,
             exit_evt,
             gpu_device_socket,
             resource_bridges,
             kill_evt: None,
-            num_scanouts: NonZeroU8::new(1).unwrap(),
+            num_scanouts,
             display_backends,
         }
     }