From f02fdd1f663760fc884073ea74fffb39a3f4ea4c Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Wed, 10 Oct 2018 17:25:14 -0700 Subject: main: autodetect disk image type Make --disk and --rwdisk automatically distinguish between qcow2 and raw disk images. --qcow and --rwqcow are kept as aliases for compatibility. BUG=chromium:893380 TEST=Boot crosvm with both raw and qcow2 disk images. Change-Id: I5b572626ca5ab894c78454f59355f27d552cbf7d Signed-off-by: Daniel Verkamp Reviewed-on: https://chromium-review.googlesource.com/1275185 Commit-Ready: ChromeOS CL Exonerator Bot Reviewed-by: Stephen Barber Reviewed-by: Zach Reizner --- src/main.rs | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 28bc09e..4dec03e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -55,15 +55,9 @@ use vm_control::VmRequest; static SECCOMP_POLICY_DIR: &'static str = "/usr/share/policy/crosvm"; -enum DiskType { - FlatFile, - Qcow, -} - struct DiskOption { path: PathBuf, read_only: bool, - disk_type: DiskType, } /// Contains all the info needed to create the system's virtio devices. @@ -233,11 +227,6 @@ fn set_argument(cfg: &mut Config, name: &str, value: Option<&str>) -> argument:: cfg.virtio_dev_info.disks.push(DiskOption { path: disk_path, read_only: !name.starts_with("rw"), - disk_type: if name.ends_with("qcow") { - DiskType::Qcow - } else { - DiskType::FlatFile - }, }); } "host_ip" => { @@ -448,9 +437,9 @@ fn run_vm(args: std::env::Args) -> std::result::Result<(), ()> { "PATH", "Path to a root disk image. Like `--disk` but adds appropriate kernel command line option."), Argument::short_value('d', "disk", "PATH", "Path to a disk image."), - Argument::value("qcow", "PATH", "Path to a qcow2 disk image."), + Argument::value("qcow", "PATH", "Path to a qcow2 disk image. (Deprecated; use --disk instead.)"), Argument::value("rwdisk", "PATH", "Path to a writable disk image."), - Argument::value("rwqcow", "PATH", "Path to a writable qcow2 disk image."), + Argument::value("rwqcow", "PATH", "Path to a writable qcow2 disk image. (Deprecated; use --rwdisk instead.)"), Argument::value("host_ip", "IP", "IP address to assign to host tap interface."), -- cgit 1.4.1