refactor: clean up "event_observer" logic

The `event_observer` field in the Vmm struct is of type Option<Stdin>.
There are two problems
1. With the way the code is written, it will never be `None`
2. `Stdin` is a singleton, there is no need to store it _anywhere_.

With that in mind, we can just remove this field, and update its two
uses to just directly operate on std::io::stdin(). Since it never
`None', we can also remove the logic that matches and handles the `None`
case. Furthermore, the `Drop` impl used to print the same error message
twice in case resetting stdin to canonical mode failed, so fix that to
only print it once.

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

Author: roypat

src/vmm/src/builder.rs

@@ -178,7 +178,6 @@ fn create_vmm_and_vcpus(
     };
 
     let vmm = Vmm {
-        events_observer: Some(std::io::stdin()),
         instance_info: instance_info.clone(),
         shutdown_exit_code: None,
         kvm,
@@ -900,7 +899,6 @@ pub(crate) mod tests {
         let (_, vcpus_exit_evt) = vm.create_vcpus(1).unwrap();
 
         Vmm {
-            events_observer: Some(std::io::stdin()),
             instance_info: InstanceInfo::default(),
             shutdown_exit_code: None,
             kvm,

src/vmm/src/lib.rs

@@ -253,10 +253,6 @@ pub enum VmmError {
     Vm(#[from] vstate::vm::VmError),
     /// Kvm error: {0}
     Kvm(#[from] vstate::kvm::KvmError),
-    /// Error thrown by observer object on Vmm initialization: {0}
-    VmmObserverInit(vmm_sys_util::errno::Error),
-    /// Error thrown by observer object on Vmm teardown: {0}
-    VmmObserverTeardown(vmm_sys_util::errno::Error),
     /// VMGenID error: {0}
     VMGenID(#[from] VmGenIdError),
 }
@@ -299,7 +295,6 @@ pub enum DumpCpuConfigError {
 /// Contains the state and associated methods required for the Firecracker VMM.
 #[derive(Debug)]
 pub struct Vmm {
-    events_observer: Option<std::io::Stdin>,
     /// The [`InstanceInfo`] state of this [`Vmm`].
     pub instance_info: InstanceInfo,
     shutdown_exit_code: Option<FcExitCode>,
@@ -363,17 +358,16 @@ impl Vmm {
         let vcpu_count = vcpus.len();
         let barrier = Arc::new(Barrier::new(vcpu_count + 1));
 
-        if let Some(stdin) = self.events_observer.as_mut() {
-            // Set raw mode for stdin.
-            stdin.lock().set_raw_mode().inspect_err(|&err| {
-                warn!("Cannot set raw mode for the terminal. {:?}", err);
-            })?;
+        let stdin = std::io::stdin().lock();
+        // Set raw mode for stdin.
+        stdin.set_raw_mode().inspect_err(|&err| {
+            warn!("Cannot set raw mode for the terminal. {:?}", err);
+        })?;
 
-            // Set non blocking stdin.
-            stdin.lock().set_non_block(true).inspect_err(|&err| {
-                warn!("Cannot set non block for the terminal. {:?}", err);
-            })?;
-        }
+        // Set non blocking stdin.
+        stdin.set_non_block(true).inspect_err(|&err| {
+            warn!("Cannot set non block for the terminal. {:?}", err);
+        })?;
 
         self.vcpus_handles.reserve(vcpu_count);
 
@@ -850,13 +844,8 @@ impl Drop for Vmm {
         // has already been stopped by the event manager at this point.
         self.stop(self.shutdown_exit_code.unwrap_or(FcExitCode::Ok));
 
-        if let Some(observer) = self.events_observer.as_mut() {
-            let res = observer.lock().set_canon_mode().inspect_err(|&err| {
-                warn!("Cannot set canonical mode for the terminal. {:?}", err);
-            });
-            if let Err(err) = res {
-                warn!("{}", VmmError::VmmObserverTeardown(err));
-            }
+        if let Err(err) = std::io::stdin().lock().set_canon_mode() {
+            warn!("Cannot set canonical mode for the terminal. {:?}", err);
         }
 
         // Write the metrics before exiting.