crosvm: use msg_socket in vm_control

Refactor existing code to use msg_socket.

BUG=None
TEST=local build and run

Change-Id: Iee72326b330e035303f679e1aedd6e5d18ad4f8a
Reviewed-on: https://chromium-review.googlesource.com/1260260
Commit-Ready: Jingkui Wang <jkwang@google.com>
Tested-by: Jingkui Wang <jkwang@google.com>
Reviewed-by: Zach Reizner <zachr@chromium.org>

2 files changed, 4 insertions, 1 deletions

diff --git a/kvm/Cargo.toml b/kvm/Cargo.toml
index 11afad4..2281598 100644
--- a/kvm/Cargo.toml
+++ b/kvm/Cargo.toml
@@ -7,3 +7,4 @@ authors = ["The Chromium OS Authors"]
 libc = "*"
 kvm_sys = { path = "../kvm_sys" }
 sys_util = { path = "../sys_util" }
+msg_socket = { path = "../msg_socket" }
diff --git a/kvm/src/lib.rs b/kvm/src/lib.rs
index 050e1cd..72bea5e 100644
--- a/kvm/src/lib.rs
+++ b/kvm/src/lib.rs
@@ -8,6 +8,7 @@ extern crate kvm_sys;
 extern crate libc;
 #[macro_use]
 extern crate sys_util;
+extern crate msg_socket;
 
 mod cap;
 
@@ -25,6 +26,7 @@ use libc::{open, EINVAL, ENOENT, ENOSPC, O_CLOEXEC, O_RDWR};
 
 use kvm_sys::*;
 
+use msg_socket::MsgOnSocket;
 #[allow(unused_imports)]
 use sys_util::{
     ioctl, ioctl_with_mut_ptr, ioctl_with_mut_ref, ioctl_with_ptr, ioctl_with_ref, ioctl_with_val,
@@ -239,7 +241,7 @@ impl AsRawFd for Kvm {
 }
 
 /// An address either in programmable I/O space or in memory mapped I/O space.
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, MsgOnSocket)]
 pub enum IoeventAddress {
     Pio(u64),
     Mmio(u64),