diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-03-10 03:06:54 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-03-10 03:06:54 +0000 |
| commit | b277139958518c6f13961a0b914c650faf94f01e (patch) | |
| tree | dbb1ca1016e78dbcfc976156b608083021ec988d /src/main.rs | |
| parent | a50434f97fd85688d8670dfd1bfd42e6afc0f94a (diff) | |
| parent | 8bb4faa6629a4d8c10d58ed9397f867b6da5c91f (diff) | |
| download | crosvm-b277139958518c6f13961a0b914c650faf94f01e.tar crosvm-b277139958518c6f13961a0b914c650faf94f01e.tar.gz crosvm-b277139958518c6f13961a0b914c650faf94f01e.tar.bz2 crosvm-b277139958518c6f13961a0b914c650faf94f01e.tar.lz crosvm-b277139958518c6f13961a0b914c650faf94f01e.tar.xz crosvm-b277139958518c6f13961a0b914c650faf94f01e.tar.zst crosvm-b277139958518c6f13961a0b914c650faf94f01e.zip | |
Merge remote-tracking branch 'origin/master' into master
Diffstat (limited to 'src/main.rs')
| -rw-r--r-- | src/main.rs | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/main.rs b/src/main.rs index 86d4baa..1804028 100644 --- a/src/main.rs +++ b/src/main.rs @@ -516,7 +516,7 @@ fn set_argument(cfg: &mut Config, name: &str, value: Option<&str>) -> argument:: syslog::set_proc_name(value.unwrap()); cfg.syslog_tag = Some(value.unwrap().to_owned()); } - "root" | "rwroot" | "disk" | "rwdisk" | "qcow" | "rwqcow" => { + "root" | "rwroot" | "disk" | "rwdisk" => { let param = value.unwrap(); let mut components = param.split(','); let read_only = !name.starts_with("rw"); @@ -1088,7 +1088,7 @@ fn set_argument(cfg: &mut Config, name: &str, value: Option<&str>) -> argument:: }); } - cfg.vfio = Some(vfio_path); + cfg.vfio.push(vfio_path); } "help" => return Err(argument::Error::PrintHelp), @@ -1200,13 +1200,6 @@ Valid keys: ", ), Argument::value( - "qcow", - "PATH", - "\ -Path to a qcow2 disk image. (Deprecated; use --disk instead.) -", - ), - Argument::value( "rwdisk", "PATH[,key=value[,key=value[,...]]", "\ @@ -1214,13 +1207,6 @@ Path to a writable disk image followed by optional comma-separated options. See --disk for valid options. ", ), - Argument::value( - "rwqcow", - "PATH", - "\ -Path to a writable qcow2 disk image. (Deprecated; use --rwdisk instead.) -", - ), Argument::value("rw-pmem-device", "PATH", "Path to a writable disk image."), Argument::value("pmem-device", "PATH", "Path to a disk image."), Argument::value( |