From fe4905612930ebe72ad6819a0e75ee70005ed6b1 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Tue, 10 Jan 2023 22:55:30 +0000 Subject: [PATCH] main: split out a few functions Switching to `argh` requires individual default functions. Signed-off-by: Wei Liu --- src/main.rs | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index b9007bad3..c1a4646f9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -114,12 +114,23 @@ impl log::Log for Logger { } fn prepare_default_values() -> (String, String, String) { - let default_vcpus = - format! {"boot={},max_phys_bits={}", config::DEFAULT_VCPUS,config::DEFAULT_MAX_PHYS_BITS}; - 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()) +} - (default_vcpus, default_memory, default_rng) +fn default_vcpus() -> String { + format!( + "boot={},max_phys_bits={}", + config::DEFAULT_VCPUS, + config::DEFAULT_MAX_PHYS_BITS + ) +} + +fn default_memory() -> String { + format!("size={}M", config::DEFAULT_MEMORY_MB) +} + +fn default_rng() -> String { + format!("src={}", config::DEFAULT_RNG_SOURCE) } fn create_app(default_vcpus: String, default_memory: String, default_rng: String) -> Command {