summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorZach Reizner <zachr@google.com>2018-03-06 17:58:09 -0800
committerchrome-bot <chrome-bot@chromium.org>2018-03-07 16:55:08 -0800
commit6c7ca93e28bb2a9cef146ef7cd001930cb63c367 (patch)
tree4241cd3acf94f5e10141aca369c896ee460bce6d /src
parent25c6bc137ecfd1f608993a3d2f24c5736c5c186a (diff)
downloadcrosvm-6c7ca93e28bb2a9cef146ef7cd001930cb63c367.tar
crosvm-6c7ca93e28bb2a9cef146ef7cd001930cb63c367.tar.gz
crosvm-6c7ca93e28bb2a9cef146ef7cd001930cb63c367.tar.bz2
crosvm-6c7ca93e28bb2a9cef146ef7cd001930cb63c367.tar.lz
crosvm-6c7ca93e28bb2a9cef146ef7cd001930cb63c367.tar.xz
crosvm-6c7ca93e28bb2a9cef146ef7cd001930cb63c367.tar.zst
crosvm-6c7ca93e28bb2a9cef146ef7cd001930cb63c367.zip
REAPPLY: crosvm: allow control of running VM via socket
This change was overwritten yet again by a bad rebase. In this case it
was CL:942084.

TEST="crosvm run -s" with socket and then subsequent "crosvm stop"
causes the running VM to be shutdown
BUG=811749

Change-Id: I04d9b71b6eeef494eb0ffcd86c7bc71a86730a19
Reviewed-on: https://chromium-review.googlesource.com/951981
Commit-Ready: Zach Reizner <zachr@chromium.org>
Tested-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: Robert Bradford <robert.bradford@intel.com>
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Reviewed-by: Stephen Barber <smbarber@chromium.org>
Diffstat (limited to 'src')
-rw-r--r--src/linux.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/linux.rs b/src/linux.rs
index 83d848f..4c14c68 100644
--- a/src/linux.rs
+++ b/src/linux.rs
@@ -674,7 +674,6 @@ pub fn run_config(cfg: Config) -> Result<()> {
     #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
     let mut next_dev_pfn = 0;
 
-    let mut control_sockets = Vec::new();
     #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
     let (io_bus, stdio_serial) = x86_64::setup_io_bus(&mut vm,
                                                       exit_evt.try_clone().