vm_control: make MaybeOwnedFd generic

This will allow more easily sending types other than File over
sockets, (e.g., UnixSeqpacket).

1 files changed, 12 insertions, 41 deletions

diff --git a/src/wl.rs b/src/wl.rs
index 419fb67..b35af8b 100644
--- a/src/wl.rs
+++ b/src/wl.rs
@@ -1,15 +1,10 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
-use std::os::unix::prelude::*;
-
 use devices::virtio::{InterruptProxy, InterruptProxyEvent, SingleFd, Worker};
 use msg_socket::{MsgReceiver, MsgSocket};
 use std::collections::BTreeMap;
 use std::fs::remove_file;
-use sys_util::{
-    net::{UnixSeqpacket, UnixSeqpacketListener},
-    EventFd, GuestMemory, SharedMemory,
-};
+use sys_util::{net::UnixSeqpacketListener, GuestMemory};
 use vm_control::VmMemoryControlRequestSocket;
 
 #[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
@@ -36,7 +31,7 @@ fn main() {
     loop {
         match msg_socket.recv() {
             Ok(SingleFd {
-                memfd,
+                shm,
                 interrupt,
                 interrupt_resample_evt,
                 in_queue,
@@ -47,8 +42,7 @@ fn main() {
                 out_queue_evt,
                 kill_evt,
             }) => {
-                let shm = unsafe { SharedMemory::from_raw_fd(memfd.as_raw_fd()) };
-                std::mem::forget(memfd);
+                let shm = shm.owned();
 
                 let regions = arch_memory_regions(MemoryParams {
                     size: shm.size(),
@@ -57,27 +51,19 @@ fn main() {
                 let mem =
                     GuestMemory::with_memfd(&regions, shm).expect("GuestMemory::with_memfd failed");
 
-                let interrupt: MsgSocket<InterruptProxyEvent, ()> = MsgSocket::new(unsafe {
-                    let sock = UnixSeqpacket::from_raw_fd(interrupt.as_raw_fd());
-                    std::mem::forget(interrupt);
-                    sock
-                });
-                let vm_socket: VmMemoryControlRequestSocket = MsgSocket::new(unsafe {
-                    let sock = UnixSeqpacket::from_raw_fd(vm_socket.as_raw_fd());
-                    std::mem::forget(vm_socket);
-                    sock
-                });
+                let interrupt: MsgSocket<InterruptProxyEvent, ()> =
+                    MsgSocket::new(interrupt.owned());
+                let vm_socket: VmMemoryControlRequestSocket = MsgSocket::new(vm_socket.owned());
 
                 let mut wayland_paths = BTreeMap::new();
                 wayland_paths.insert("".into(), "/run/user/1000/wayland-0".into());
 
                 let mut worker = Worker::new(
                     mem,
-                    Box::new(InterruptProxy::new(interrupt, unsafe {
-                        let evt = EventFd::from_raw_fd(interrupt_resample_evt.as_raw_fd());
-                        std::mem::forget(interrupt_resample_evt);
-                        evt
-                    })),
+                    Box::new(InterruptProxy::new(
+                        interrupt,
+                        interrupt_resample_evt.owned(),
+                    )),
                     in_queue,
                     out_queue,
                     wayland_paths,
@@ -87,23 +73,8 @@ fn main() {
                 );
 
                 worker.run(
-                    vec![
-                        unsafe {
-                            let evt = EventFd::from_raw_fd(in_queue_evt.as_raw_fd());
-                            std::mem::forget(in_queue_evt);
-                            evt
-                        },
-                        unsafe {
-                            let evt = EventFd::from_raw_fd(out_queue_evt.as_raw_fd());
-                            std::mem::forget(out_queue_evt);
-                            evt
-                        },
-                    ],
-                    unsafe {
-                        let evt = EventFd::from_raw_fd(kill_evt.as_raw_fd());
-                        std::mem::forget(kill_evt);
-                        evt
-                    },
+                    vec![in_queue_evt.owned(), out_queue_evt.owned()],
+                    kill_evt.owned(),
                 );
             }