From 17a167dbb63afa2b07923b96815a5dbaf6ce0996 Mon Sep 17 00:00:00 2001 From: Sebastien Boeuf Date: Fri, 13 Dec 2019 08:34:39 +0100 Subject: [PATCH] main: Move default values preparation into a dedicated function This brings more modularity to the code, which will be helpful when we will later test the CLI and OpenAPI generate the same VmConfig output. Signed-off-by: Sebastien Boeuf --- src/main.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main.rs b/src/main.rs index 17440092b..72d53e284 100755 --- a/src/main.rs +++ b/src/main.rs @@ -62,6 +62,14 @@ impl log::Log for Logger { fn flush(&self) {} } +fn prepare_default_values() -> (String, String, String) { + let default_vcpus = format! {"boot={}", config::DEFAULT_VCPUS}; + let default_memory = format! {"size={}M", config::DEFAULT_MEMORY_MB}; + let default_rng = format! {"src={}", config::DEFAULT_RNG_SOURCE}; + + (default_vcpus, default_memory, default_rng) +} + fn create_app<'a, 'b>( default_vcpus: &'a str, default_memory: &'a str, @@ -269,9 +277,7 @@ fn main() { } } - let default_vcpus = format! {"boot={}", config::DEFAULT_VCPUS}; - let default_memory = format! {"size={}M", config::DEFAULT_MEMORY_MB}; - let default_rng = format! {"src={}", config::DEFAULT_RNG_SOURCE}; + let (default_vcpus, default_memory, default_rng) = prepare_default_values(); let cmd_arguments = create_app( &default_vcpus,