crosvm: allow control of running VM via socket

Remove control_sockets definition that shadows earlier one which
contains the opened socket for receiving messages for controlling the
running VM. This shadowing meant that the messages sent over the socket
were not handled.

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

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
Change-Id: If5a82ec10c29ab037cbedcf7acea23a49b4cfeb6
Reviewed-on: https://chromium-review.googlesource.com/916264
Commit-Ready: Dylan Reid <dgreid@chromium.org>
Tested-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
This commit is contained in:
Rob Bradford 2018-02-13 14:54:09 +00:00 committed by chrome-bot
parent bfba99376a
commit 30ebd272d6

View file

@ -733,7 +733,6 @@ pub fn run_config(cfg: Config) -> Result<()> {
.unwrap();
let mut next_dev_pfn = BASE_DEV_MEMORY_PFN;
let mut control_sockets = Vec::new();
let (io_bus, stdio_serial) = setup_io_bus(&mut vm,
exit_evt.try_clone().map_err(Error::CloneEventFd)?)?;