From 793327cff87bc219cc34085bee828db9b6a1f29b Mon Sep 17 00:00:00 2001
From: Sebastien Boeuf <sebastien.boeuf@intel.com>
Date: Tue, 10 Dec 2019 15:40:47 +0100
Subject: [PATCH] vmm: api: Make ConsoleConfig default match between CLI and
 HTTP API

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>
---
 vmm/src/config.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/vmm/src/config.rs b/vmm/src/config.rs
index da9f12ecb..73ceeae48 100644
--- a/vmm/src/config.rs
+++ b/vmm/src/config.rs
@@ -591,19 +591,24 @@ impl ConsoleOutputMode {
 
 #[derive(Clone, Deserialize, Serialize)]
 pub struct ConsoleConfig {
+    #[serde(default = "default_consoleconfig_file")]
     pub file: Option<PathBuf>,
     pub mode: ConsoleOutputMode,
     #[serde(default)]
     pub iommu: bool,
 }
 
+fn default_consoleconfig_file() -> Option<PathBuf> {
+    None
+}
+
 impl ConsoleConfig {
     pub fn parse(console: &str) -> Result<Self> {
         // Split the parameters based on the comma delimiter
         let params_list: Vec<&str> = console.split(',').collect();
 
         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 iommu_str: &str = "";