External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-23 03:42:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: api: Make ConsoleConfig default match between CLI and HTTP API

Browse Source 
A simple patch making sure the field "file" is provisioned with the same
default value through CLI and OpenAPI.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2019-12-10 15:40:47 +01:00 committed by Rob Bradford
parent cc08c44cb9
commit 793327cff8
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vmm/src/config.rs
View File

@ -591,19 +591,24 @@ impl ConsoleOutputMode {
#[derive(Clone, Deserialize, Serialize)] #[derive(Clone, Deserialize, Serialize)]
pub struct ConsoleConfig { pub struct ConsoleConfig {
#[serde(default = "default_consoleconfig_file")]
pub file: Option<PathBuf>, pub file: Option<PathBuf>,
pub mode: ConsoleOutputMode, pub mode: ConsoleOutputMode,
#[serde(default)] #[serde(default)]
pub iommu: bool, pub iommu: bool,
} }
fn default_consoleconfig_file() -> Option<PathBuf> {
None
}
impl ConsoleConfig { impl ConsoleConfig {
pub fn parse(console: &str) -> Result<Self> { pub fn parse(console: &str) -> Result<Self> {
// Split the parameters based on the comma delimiter // Split the parameters based on the comma delimiter
let params_list: Vec<&str> = console.split(',').collect(); let params_list: Vec<&str> = console.split(',').collect();
let mut valid = false; let mut valid = false;
let mut file: Option<PathBuf> = None; let mut file: Option<PathBuf> = default_consoleconfig_file();
let mut mode: ConsoleOutputMode = ConsoleOutputMode::Off; let mut mode: ConsoleOutputMode = ConsoleOutputMode::Off;
let mut iommu_str: &str = ""; let mut iommu_str: &str = "";