kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: config: Accept empty value strings

Browse Source 
The integration tests and documentation make use of empty value strings
like "--net tap=" accept them but return None so that the default value
will be used as expected.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
2020-04-01 09:46:16 +01:00
parent 218c780f67
commit 057e71d266
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vmm/src/config.rs
+5 -2
View File
@@ -132,7 +132,10 @@ impl OptionParser {
} }
pub fn get(&self, option: &str) -> Option<String> { pub fn get(&self, option: &str) -> Option<String> {
self.options.get(option).and_then(|v| v.value.clone()) self.options
.get(option)
.and_then(|v| v.value.clone())
.and_then(|s| if s.is_empty() { None } else { Some(s) })
} }
pub fn is_set(&self, option: &str) -> bool { pub fn is_set(&self, option: &str) -> bool {
@@ -143,7 +146,7 @@ impl OptionParser {
} }
pub fn convert<T: FromStr>(&self, option: &str) -> OptionParserResult<Option<T>> { pub fn convert<T: FromStr>(&self, option: &str) -> OptionParserResult<Option<T>> {
match self.options.get(option).and_then(|v| v.value.as_ref()) { match self.get(option) {
None => Ok(None), None => Ok(None),
Some(v) => Ok(Some(v.parse().map_err(|_| { Some(v) => Ok(Some(v.parse().map_err(|_| {
OptionParserError::Conversion(option.to_owned(), v.to_owned()) OptionParserError::Conversion(option.to_owned(), v.to_owned())