refactor: simplify creation of I8042 device

We always create anew the keyboard interrupt event. Just create it
inside `I8042Device::new()` and return an error if that fails.

Signed-off-by: Babis Chalios <[email protected]>

Author: bchalios

src/vmm/src/device_manager/legacy.rs

@@ -259,10 +259,9 @@ mod tests {
                 ),
                 input: None,
             })),
-            Arc::new(Mutex::new(I8042Device::new(
-                EventFd::new(libc::EFD_NONBLOCK).unwrap(),
-                EventFd::new(libc::EFD_NONBLOCK).unwrap(),
-            ))),
+            Arc::new(Mutex::new(
+                I8042Device::new(EventFd::new(libc::EFD_NONBLOCK).unwrap()).unwrap(),
+            )),
         )
         .unwrap();
         ldm.register_devices(&io_bus, vm.fd()).unwrap();

src/vmm/src/device_manager/mod.rs

@@ -159,10 +159,7 @@ impl DeviceManager {
                 .try_clone()
                 .map_err(DeviceManagerCreateError::EventFd)?;
             // Create keyboard emulator for reset event
-            let i8042 = Arc::new(Mutex::new(I8042Device::new(
-                reset_evt,
-                EventFd::new(libc::EFD_NONBLOCK).map_err(DeviceManagerCreateError::EventFd)?,
-            )));
+            let i8042 = Arc::new(Mutex::new(I8042Device::new(reset_evt)?));
 
             // create pio dev manager with legacy devices
             let mut legacy_devices = PortIODeviceManager::new(serial, i8042)?;
@@ -404,10 +401,9 @@ pub(crate) mod tests {
             Arc::new(Mutex::new(
                 SerialDevice::new(None, SerialOut::Sink(std::io::sink())).unwrap(),
             )),
-            Arc::new(Mutex::new(I8042Device::new(
-                EventFd::new(libc::EFD_NONBLOCK).unwrap(),
-                EventFd::new(libc::EFD_NONBLOCK).unwrap(),
-            ))),
+            Arc::new(Mutex::new(
+                I8042Device::new(EventFd::new(libc::EFD_NONBLOCK).unwrap()).unwrap(),
+            )),
         )
         .unwrap();
 

src/vmm/src/devices/legacy/i8042.rs

@@ -119,18 +119,18 @@ pub struct I8042Device {
 
 impl I8042Device {
     /// Constructs an i8042 device that will signal the given event when the guest requests it.
-    pub fn new(reset_evt: EventFd, kbd_interrupt_evt: EventFd) -> I8042Device {
-        I8042Device {
+    pub fn new(reset_evt: EventFd) -> Result<I8042Device, std::io::Error> {
+        Ok(I8042Device {
             reset_evt,
-            kbd_interrupt_evt,
+            kbd_interrupt_evt: EventFd::new(libc::EFD_NONBLOCK)?,
             control: CB_POST_OK | CB_KBD_INT,
             cmd: 0,
             outp: 0,
             status: SB_KBD_ENABLED,
             buf: [0; BUF_SIZE],
             bhead: Wrapping(0),
             btail: Wrapping(0),
-        }
+        })
     }
 
     /// Signal a ctrl-alt-del (reset) event.
@@ -355,10 +355,7 @@ mod tests {
 
     #[test]
     fn test_i8042_read_write_and_event() {
-        let mut i8042 = I8042Device::new(
-            EventFd::new(libc::EFD_NONBLOCK).unwrap(),
-            EventFd::new(libc::EFD_NONBLOCK).unwrap(),
-        );
+        let mut i8042 = I8042Device::new(EventFd::new(libc::EFD_NONBLOCK).unwrap()).unwrap();
         let reset_evt = i8042.reset_evt.try_clone().unwrap();
 
         // Check if reading in a 2-length array doesn't have side effects.
@@ -395,10 +392,7 @@ mod tests {
 
     #[test]
     fn test_i8042_commands() {
-        let mut i8042 = I8042Device::new(
-            EventFd::new(libc::EFD_NONBLOCK).unwrap(),
-            EventFd::new(libc::EFD_NONBLOCK).unwrap(),
-        );
+        let mut i8042 = I8042Device::new(EventFd::new(libc::EFD_NONBLOCK).unwrap()).unwrap();
         let mut data = [1];
 
         // Test reading/writing the control register.
@@ -435,10 +429,7 @@ mod tests {
 
     #[test]
     fn test_i8042_buffer() {
-        let mut i8042 = I8042Device::new(
-            EventFd::new(libc::EFD_NONBLOCK).unwrap(),
-            EventFd::new(libc::EFD_NONBLOCK).unwrap(),
-        );
+        let mut i8042 = I8042Device::new(EventFd::new(libc::EFD_NONBLOCK).unwrap()).unwrap();
 
         // Test push/pop.
         i8042.push_byte(52).unwrap();
@@ -462,10 +453,7 @@ mod tests {
 
     #[test]
     fn test_i8042_kbd() {
-        let mut i8042 = I8042Device::new(
-            EventFd::new(libc::EFD_NONBLOCK).unwrap(),
-            EventFd::new(libc::EFD_NONBLOCK).unwrap(),
-        );
+        let mut i8042 = I8042Device::new(EventFd::new(libc::EFD_NONBLOCK).unwrap()).unwrap();
 
         fn expect_key(i8042: &mut I8042Device, key: u16) {
             let mut data = [1];