diff options
author | Zach Reizner <zachr@google.com> | 2019-06-19 17:46:03 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-08-08 03:19:58 +0000 |
commit | 0f2cfb095dc2d49bfe22cb2d560b7777a19901e8 (patch) | |
tree | 366bf094ea0194b21f5d7415259281717cb32d3d /devices/src/virtio/gpu/mod.rs | |
parent | 7f855be1f96905c44599b944a0d8449ae528ac39 (diff) | |
download | crosvm-0f2cfb095dc2d49bfe22cb2d560b7777a19901e8.tar crosvm-0f2cfb095dc2d49bfe22cb2d560b7777a19901e8.tar.gz crosvm-0f2cfb095dc2d49bfe22cb2d560b7777a19901e8.tar.bz2 crosvm-0f2cfb095dc2d49bfe22cb2d560b7777a19901e8.tar.lz crosvm-0f2cfb095dc2d49bfe22cb2d560b7777a19901e8.tar.xz crosvm-0f2cfb095dc2d49bfe22cb2d560b7777a19901e8.tar.zst crosvm-0f2cfb095dc2d49bfe22cb2d560b7777a19901e8.zip |
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>
Diffstat (limited to 'devices/src/virtio/gpu/mod.rs')
-rw-r--r-- | devices/src/virtio/gpu/mod.rs | 12 |
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, } } |