mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-04 04:25:45 +00:00
vmm: Move 'default_serial/console()' to vm_config.rs
In this way, we have all functions related to generate default values of vm-config structs in the same location. Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
parent
fd9fa2a681
commit
29cf637f3f
@ -1414,22 +1414,6 @@ impl ConsoleConfig {
|
|||||||
|
|
||||||
Ok(Self { file, mode, iommu })
|
Ok(Self { file, mode, iommu })
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn default_serial() -> Self {
|
|
||||||
ConsoleConfig {
|
|
||||||
file: None,
|
|
||||||
mode: ConsoleOutputMode::Null,
|
|
||||||
iommu: false,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn default_console() -> Self {
|
|
||||||
ConsoleConfig {
|
|
||||||
file: None,
|
|
||||||
mode: ConsoleOutputMode::Tty,
|
|
||||||
iommu: false,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl DeviceConfig {
|
impl DeviceConfig {
|
||||||
|
@ -532,6 +532,22 @@ pub struct PayloadConfig {
|
|||||||
pub initramfs: Option<PathBuf>,
|
pub initramfs: Option<PathBuf>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn default_serial() -> ConsoleConfig {
|
||||||
|
ConsoleConfig {
|
||||||
|
file: None,
|
||||||
|
mode: ConsoleOutputMode::Null,
|
||||||
|
iommu: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn default_console() -> ConsoleConfig {
|
||||||
|
ConsoleConfig {
|
||||||
|
file: None,
|
||||||
|
mode: ConsoleOutputMode::Tty,
|
||||||
|
iommu: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
|
||||||
pub struct VmConfig {
|
pub struct VmConfig {
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
@ -546,9 +562,9 @@ pub struct VmConfig {
|
|||||||
pub balloon: Option<BalloonConfig>,
|
pub balloon: Option<BalloonConfig>,
|
||||||
pub fs: Option<Vec<FsConfig>>,
|
pub fs: Option<Vec<FsConfig>>,
|
||||||
pub pmem: Option<Vec<PmemConfig>>,
|
pub pmem: Option<Vec<PmemConfig>>,
|
||||||
#[serde(default = "ConsoleConfig::default_serial")]
|
#[serde(default = "default_serial")]
|
||||||
pub serial: ConsoleConfig,
|
pub serial: ConsoleConfig,
|
||||||
#[serde(default = "ConsoleConfig::default_console")]
|
#[serde(default = "default_console")]
|
||||||
pub console: ConsoleConfig,
|
pub console: ConsoleConfig,
|
||||||
pub devices: Option<Vec<DeviceConfig>>,
|
pub devices: Option<Vec<DeviceConfig>>,
|
||||||
pub user_devices: Option<Vec<UserDeviceConfig>>,
|
pub user_devices: Option<Vec<UserDeviceConfig>>,
|
||||||
|
Loading…
Reference in New Issue
Block a user