vmm: Seperate config structs for virito and serial consoles

Signed-off-by: Matej Hrica <[email protected]>

Author: mtjhrc

src/libkrun/src/lib.rs

@@ -38,7 +38,7 @@ use std::sync::atomic::{AtomicI32, Ordering};
 use std::sync::LazyLock;
 use std::sync::Mutex;
 use utils::eventfd::EventFd;
-use vmm::resources::{ConsoleConfig, ConsoleType, VmResources};
+use vmm::resources::{DefaultVirtioConsoleConfig, SerialConsoleConfig, VmResources};
 #[cfg(feature = "blk")]
 use vmm::vmm_config::block::{BlockDeviceConfig, BlockRootConfig};
 #[cfg(not(feature = "tee"))]
@@ -2117,12 +2117,8 @@ pub unsafe extern "C" fn krun_add_virtio_console_default(
     match CTX_MAP.lock().unwrap().entry(ctx_id) {
         Entry::Occupied(mut ctx_cfg) => {
             let cfg = ctx_cfg.get_mut();
-            cfg.vmr.consoles.entry(ConsoleType::Virtio).or_default();
 
-            // safe to unwrap since we inserted an empty Vec if the key didn't exist
-            let consoles = cfg.vmr.consoles.get_mut(&ConsoleType::Virtio).unwrap();
-            consoles.push(ConsoleConfig {
-                output_path: None,
+            cfg.vmr.virtio_consoles.push(DefaultVirtioConsoleConfig {
                 input_fd,
                 output_fd,
                 err_fd,
@@ -2144,15 +2140,9 @@ pub unsafe extern "C" fn krun_add_serial_console_default(
     match CTX_MAP.lock().unwrap().entry(ctx_id) {
         Entry::Occupied(mut ctx_cfg) => {
             let cfg = ctx_cfg.get_mut();
-            cfg.vmr.consoles.entry(ConsoleType::Serial).or_default();
-
-            // safe to unwrap since we inserted an empty Vec if the key didn't exist
-            let consoles = cfg.vmr.consoles.get_mut(&ConsoleType::Serial).unwrap();
-            consoles.push(ConsoleConfig {
-                output_path: None,
+            cfg.vmr.serial_consoles.push(SerialConsoleConfig {
                 input_fd,
                 output_fd,
-                err_fd: -1,
             });
         }
         Entry::Vacant(_) => return -libc::ENOENT,

src/vmm/src/builder.rs

@@ -24,7 +24,7 @@ use super::{Error, Vmm};
 #[cfg(target_arch = "x86_64")]
 use crate::device_manager::legacy::PortIODeviceManager;
 use crate::device_manager::mmio::MMIODeviceManager;
-use crate::resources::{ConsoleType, VmResources};
+use crate::resources::{DefaultVirtioConsoleConfig, VmResources};
 use crate::vmm_config::external_kernel::{ExternalKernel, KernelFormat};
 #[cfg(feature = "net")]
 use crate::vmm_config::net::NetBuilder;
@@ -722,11 +722,7 @@ pub fn build_microvm(
         )?);
     };
 
-    for s in vm_resources
-        .consoles
-        .get(&ConsoleType::Serial)
-        .unwrap_or(&Vec::new())
-    {
+    for s in &vm_resources.serial_consoles {
         let input: Option<Box<dyn devices::legacy::ReadableFd + Send>> = if s.input_fd >= 0 {
             Some(Box::new(unsafe { File::from_raw_fd(s.input_fd) }))
         } else {
@@ -941,12 +937,7 @@ pub fn build_microvm(
         console_id += 1;
     }
 
-    for console in vm_resources
-        .consoles
-        .get(&ConsoleType::Virtio)
-        .unwrap_or(&Vec::new())
-        .iter()
-    {
+    for console in vm_resources.virtio_consoles.iter() {
         attach_console_devices(
             &mut vmm,
             event_manager,
@@ -1865,7 +1856,7 @@ fn attach_console_devices(
     event_manager: &mut EventManager,
     intc: IrqChip,
     vm_resources: &VmResources,
-    cfg: Option<&super::resources::ConsoleConfig>,
+    cfg: Option<&DefaultVirtioConsoleConfig>,
     id_number: u32,
 ) -> std::result::Result<(), StartMicrovmError> {
     use self::StartMicrovmError::*;

src/vmm/src/resources.rs

@@ -3,7 +3,6 @@
 
 //#![deny(warnings)]
 
-use std::collections::HashMap;
 #[cfg(feature = "tee")]
 use std::fs::File;
 #[cfg(feature = "tee")]
@@ -29,7 +28,6 @@ use crate::vmm_config::machine_config::{VmConfig, VmConfigError};
 use crate::vmm_config::net::{NetBuilder, NetworkInterfaceConfig, NetworkInterfaceError};
 use crate::vmm_config::vsock::*;
 use crate::vstate::VcpuConfig;
-
 #[cfg(feature = "gpu")]
 use devices::virtio::display::DisplayInfo;
 #[cfg(feature = "tee")]
@@ -83,15 +81,12 @@ impl Default for TeeConfig {
     }
 }
 
-#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq)]
-pub enum ConsoleType {
-    Serial,
-    Virtio,
+pub struct SerialConsoleConfig {
+    pub input_fd: RawFd,
+    pub output_fd: RawFd,
 }
 
-#[derive(Debug, Default)]
-pub struct ConsoleConfig {
-    pub output_path: Option<PathBuf>,
+pub struct DefaultVirtioConsoleConfig {
     pub input_fd: RawFd,
     pub output_fd: RawFd,
     pub err_fd: RawFd,
@@ -153,8 +148,10 @@ pub struct VmResources {
     pub disable_implicit_console: bool,
     /// The console id to use for console= in the kernel cmdline
     pub kernel_console: Option<String>,
-    /// Consoles to attach to the guest
-    pub consoles: HashMap<ConsoleType, Vec<ConsoleConfig>>,
+    /// Serial consoles to attach to the guest
+    pub serial_consoles: Vec<SerialConsoleConfig>,
+    /// Virtio consoles to attach to the guest
+    pub virtio_consoles: Vec<DefaultVirtioConsoleConfig>,
 }
 
 impl VmResources {
@@ -353,7 +350,7 @@ impl VmResources {
 mod tests {
     #[cfg(feature = "gpu")]
     use crate::resources::DisplayBackendConfig;
-    use crate::resources::VmResources;
+    use crate::resources::{DefaultVirtioConsoleConfig, VmResources};
     use crate::vmm_config::kernel_cmdline::KernelCmdlineConfig;
     use crate::vmm_config::machine_config::{CpuFeaturesTemplate, VmConfig, VmConfigError};
     use crate::vmm_config::vsock::tests::{default_config, TempSockFile};
@@ -393,7 +390,8 @@ mod tests {
             nested_enabled: false,
             split_irqchip: false,
             disable_implicit_console: false,
-            consoles: HashMap::new(),
+            serial_consoles: Vec::new(),
+            virtio_consoles: Vec::new(),
             kernel_console: None,
         }
     }