refactor: drop usage of std::io::Sink

This type is only useful if we are dynamically dispatching io via the
Read/Write traits, but we are not doing that (we converted everything to
static dispatch a while back, for better or for worse, and to avoid
conflicts with the PCI branch, I'm not reverting that here).

Signed-off-by: Patrick Roy <[email protected]>

Author: roypat

src/vmm/src/device_manager/legacy.rs

@@ -104,7 +104,7 @@ impl PortIODeviceManager {
                 SerialEventsWrapper {
                     buffer_ready_event_fd: None,
                 },
-                SerialOut::Sink(std::io::sink()),
+                SerialOut::Sink,
             ),
             input: None,
         }));
@@ -114,7 +114,7 @@ impl PortIODeviceManager {
                 SerialEventsWrapper {
                     buffer_ready_event_fd: None,
                 },
-                SerialOut::Sink(std::io::sink()),
+                SerialOut::Sink,
             ),
             input: None,
         }));
@@ -249,7 +249,7 @@ mod tests {
                     SerialEventsWrapper {
                         buffer_ready_event_fd: None,
                     },
-                    SerialOut::Sink(std::io::sink()),
+                    SerialOut::Sink,
                 ),
                 input: None,
             })),

src/vmm/src/device_manager/mod.rs

@@ -555,7 +555,7 @@ pub(crate) mod tests {
         #[cfg(target_arch = "x86_64")]
         let legacy_devices = PortIODeviceManager::new(
             Arc::new(Mutex::new(
-                SerialDevice::new(None, SerialOut::Sink(std::io::sink())).unwrap(),
+                SerialDevice::new(None, SerialOut::Sink).unwrap(),
             )),
             Arc::new(Mutex::new(
                 I8042Device::new(EventFd::new(libc::EFD_NONBLOCK).unwrap()).unwrap(),

src/vmm/src/devices/legacy/serial.rs

@@ -127,19 +127,19 @@ impl SerialEvents for SerialEventsWrapper {
 
 #[derive(Debug)]
 pub enum SerialOut {
-    Sink(std::io::Sink),
+    Sink,
     Stdout(std::io::Stdout),
 }
 impl std::io::Write for SerialOut {
     fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
         match self {
-            Self::Sink(sink) => sink.write(buf),
+            Self::Sink => Ok(buf.len()),
             Self::Stdout(stdout) => stdout.write(buf),
         }
     }
     fn flush(&mut self) -> std::io::Result<()> {
         match self {
-            Self::Sink(sink) => sink.flush(),
+            Self::Sink => Ok(()),
             Self::Stdout(stdout) => stdout.flush(),
         }
     }
@@ -407,7 +407,7 @@ mod tests {
                 SerialEventsWrapper {
                     buffer_ready_event_fd: None,
                 },
-                SerialOut::Sink(std::io::sink()),
+                SerialOut::Sink,
             ),
             input: None::<std::io::Stdin>,
         };