commit f527cdf65209a2fa14664a72dc1f4f3425dab696
author Nicolas Norvez <norvez@chromium.org> Fri Jan 26 11:55:44 2018 -0800
committer chrome-bot <chrome-bot@chromium.org> Sat Jan 27 04:14:31 2018 -0800
tree 239d34fe72329be4c62566a1f88a46c6f69f95a4
parent 39d16f6ba34e45b9020aee23e730deea4759a6a5

cros_vm: Support non-raw image formats

Let the user choose the format of the image (e.g. qcow2) instead of
forcing it to raw with the --image-format option. The default is still
'raw'

BUG=chromium:806334
TEST=cros_vm --start still passes the raw format to qemu
TEST=cros_vm --start --image-format qcow2 passes the qcow2 format to
qemu

Change-Id: Ida938c485089557c5e7e11f9b936ffb784266eea
Reviewed-on: https://chromium-review.googlesource.com/888264
Commit-Ready: Nicolas Norvez <norvez@chromium.org>
Tested-by: Nicolas Norvez <norvez@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

scripts/cros_vm.py

diff --git a/scripts/cros_vm.py b/scripts/cros_vm.py
index 89f6976..93b72ab 100644
--- a/scripts/cros_vm.py
+++ b/scripts/cros_vm.py
@@ -36,6 +36,7 @@
   """Class for managing a VM."""
 
   SSH_PORT = 9222
+  IMAGE_FORMAT = 'raw'
 
   def __init__(self, argv):
     """Initialize VM.
@@ -54,6 +55,7 @@
     self.use_sudo = self.enable_kvm and not os.access('/dev/kvm', os.W_OK)
     self.display = opts.display
     self.image_path = opts.image_path
+    self.image_format = opts.image_format
     self.board = opts.board
     self.ssh_port = opts.ssh_port
     self.dry_run = opts.dry_run
@@ -256,8 +258,8 @@
         '-net', 'nic,model=virtio,vlan=%d' % self.ssh_port,
         '-net', 'user,hostfwd=tcp:127.0.0.1:%d-:22,vlan=%d'
         % (self.ssh_port, self.ssh_port),
-        '-drive', 'file=%s,index=0,media=disk,cache=unsafe,format=raw'
-        % self.image_path,
+        '-drive', 'file=%s,index=0,media=disk,cache=unsafe,format=%s'
+        % (self.image_path, self.image_format),
     ]
     if self.enable_kvm:
       qemu_args.append('-enable-kvm')
@@ -399,6 +401,8 @@
                         help='Stop the VM.')
     parser.add_argument('--image-path', type='path',
                         help='Path to VM image to launch with --start.')
+    parser.add_argument('--image-format', default=VM.IMAGE_FORMAT,
+                        help='Format of the VM image (raw, qcow2, ...).')
     parser.add_argument('--qemu-path', type='path',
                         help='Path of qemu binary to launch with --start.')
     parser.add_argument('--qemu-bios-path', type='path',