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

vmm: config: Support on/off/true/false for all booleans

Browse Source 
Migrate missing boolean controls over to the Toggle to handle all
values.

Fixes: #936

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-04-30 13:43:11 +01:00 committed by Sebastien Boeuf
parent d5bfa2dfc8
commit 5115ad6e56
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vmm/src/config.rs
View File

@ -644,18 +644,21 @@ impl DiskConfig {
.map_err(Error::ParseDisk)? .map_err(Error::ParseDisk)?
.unwrap_or_else(default_diskconfig_num_queues); .unwrap_or_else(default_diskconfig_num_queues);
let vhost_user = parser let vhost_user = parser
.convert("vhost_user") .convert::<Toggle>("vhost_user")
.map_err(Error::ParseDisk)? .map_err(Error::ParseDisk)?
.unwrap_or(false); .unwrap_or(Toggle(false))
.0;
let vhost_socket = parser.get("socket"); let vhost_socket = parser.get("socket");
let wce = parser let wce = parser
.convert("wce") .convert::<Toggle>("wce")
.map_err(Error::ParseDisk)? .map_err(Error::ParseDisk)?
.unwrap_or_else(default_diskconfig_wce); .unwrap_or_else(|| Toggle(default_diskconfig_wce()))
.0;
let poll_queue = parser let poll_queue = parser
.convert("poll_queue") .convert::<Toggle>("poll_queue")
.map_err(Error::ParseDisk)? .map_err(Error::ParseDisk)?
.unwrap_or_else(default_diskconfig_poll_queue); .unwrap_or_else(|| Toggle(default_diskconfig_poll_queue()))
.0;
let id = parser.get("id"); let id = parser.get("id");
if parser.is_set("wce") && !vhost_user { if parser.is_set("wce") && !vhost_user {
@ -795,9 +798,10 @@ impl NetConfig {
.map_err(Error::ParseNetwork)? .map_err(Error::ParseNetwork)?
.unwrap_or_else(default_netconfig_num_queues); .unwrap_or_else(default_netconfig_num_queues);
let vhost_user = parser let vhost_user = parser
.convert("vhost_user") .convert::<Toggle>("vhost_user")
.map_err(Error::ParseNetwork)? .map_err(Error::ParseNetwork)?
.unwrap_or(false); .unwrap_or(Toggle(false))
.0;
let vhost_socket = parser.get("socket"); let vhost_socket = parser.get("socket");
let id = parser.get("id"); let id = parser.get("id");