External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-07-04 17:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: For --disk error if socket and path is specified

Browse Source 
This is an error as the path should be specfied by the unmanaged
backend.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-03-13 10:28:39 +00:00
parent 7e599b4450
commit 4579afa091
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.rs
View File

@ -653,12 +653,12 @@ mod unit_tests {
vec![ vec![
"cloud-hypervisor", "cloud-hypervisor",
"--disk", "--disk",
"path=/path/to/disk/1,vhost_user=true,socket=/tmp/socket1", "vhost_user=true,socket=/tmp/socket1",
"path=/path/to/disk/2", "path=/path/to/disk/2",
], ],
r#"{ r#"{
"disks": [ "disks": [
{"path": "/path/to/disk/1", "vhost_user":true, "vhost_socket":"/tmp/socket1"}, {"vhost_user":true, "vhost_socket":"/tmp/socket1"},
{"path": "/path/to/disk/2"} {"path": "/path/to/disk/2"}
] ]
}"#, }"#,
@ -668,12 +668,12 @@ mod unit_tests {
vec![ vec![
"cloud-hypervisor", "cloud-hypervisor",
"--disk", "--disk",
"path=/path/to/disk/1,vhost_user=true,socket=/tmp/socket1,wce=true", "vhost_user=true,socket=/tmp/socket1,wce=true",
"path=/path/to/disk/2", "path=/path/to/disk/2",
], ],
r#"{ r#"{
"disks": [ "disks": [
{"path": "/path/to/disk/1", "vhost_user":true, "vhost_socket":"/tmp/socket1", "wce":true}, {"vhost_user":true, "vhost_socket":"/tmp/socket1", "wce":true},
{"path": "/path/to/disk/2"} {"path": "/path/to/disk/2"}
] ]
}"#, }"#,

6
vmm/src/config.rs
View File

@ -49,6 +49,8 @@ pub enum Error {
ParseDiskVhostParam(std::str::ParseBoolError), ParseDiskVhostParam(std::str::ParseBoolError),
/// Failed parsing disk wce parameter. /// Failed parsing disk wce parameter.
ParseDiskWceParam(std::str::ParseBoolError), ParseDiskWceParam(std::str::ParseBoolError),
/// Both socket and path specified
ParseDiskSocketAndPath,
/// Failed parsing random number generator parameters. /// Failed parsing random number generator parameters.
ParseRngParams, ParseRngParams,
/// Failed parsing network ip parameter. /// Failed parsing network ip parameter.
@ -453,6 +455,10 @@ impl DiskConfig {
path = Some(PathBuf::from(path_str)) path = Some(PathBuf::from(path_str))
} }
if vhost_socket.as_ref().and(path.as_ref()).is_some() {
return Err(Error::ParseDiskSocketAndPath);
}
Ok(DiskConfig { Ok(DiskConfig {
path, path,
readonly: parse_on_off(readonly_str)?, readonly: parse_on_off(readonly_str)?,