commit f282f6c37d6ae4c4e492ad52f7019e871c1c2d72
author Chris Sosa <sosa@chromium.org> Tue Jul 01 10:50:17 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Sat Aug 09 02:37:57 2014 +0000
tree 5f4ba0bca4fd9705e5ac0fc80c222c507021f51d
parent 50e9e8570fa0b2d9453d2ab41fe4d74732ae0eaa

Add support to cros_vm_lib.sh to mount the disk as a virtio-scsi device.

This CL adds a flag that changes the device type to a virtio-scsi disk.
To build an image that works with scsi:

USE=gce ./build_packages, etc

BUG=chromium:391105
TEST=Tested with/without scsi set.

Change-Id: I43301b7aaa2cfa42faa2e80eb567315ae8b48dd4
Reviewed-on: https://chromium-review.googlesource.com/206583
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
Commit-Queue: Chris Sosa <sosa@chromium.org>

lib/cros_vm_lib.sh

diff --git a/lib/cros_vm_lib.sh b/lib/cros_vm_lib.sh
index 3b5bdeb..8fcf082 100644
--- a/lib/cros_vm_lib.sh
+++ b/lib/cros_vm_lib.sh
@@ -10,6 +10,8 @@
 DEFINE_string mem_path "" "VM memory image to save or restore."
 DEFINE_boolean no_graphics ${FLAGS_FALSE} "Runs the KVM instance silently."
 DEFINE_boolean persist "${FLAGS_FALSE}" "Persist vm."
+DEFINE_boolean scsi ${FLAGS_FALSE} "Loads disk as a virtio-scsi-disk. "\
+"This option is used for testing Google Compute Engine-compatible images."
 DEFINE_boolean snapshot ${FLAGS_FALSE} "Don't commit changes to image."
 DEFINE_integer ssh_port 9222 "Port to tunnel ssh traffic over."
 DEFINE_string vnc "" "VNC Server to display to instead of SDL "\
@@ -182,6 +184,14 @@
       sudo chmod 600 "${pipe}"
     done
 
+    local drive
+    drive="-drive file=${vm_image},index=0,media=disk,cache=${cache_type}"
+    if [ ${FLAGS_scsi} -eq ${FLAGS_TRUE} ]; then
+      drive=$(echo "-drive if=none,id=hd,file=${vm_image},cache=${cache_type}"\
+          "-device virtio-scsi-pci,id=scsi "\
+          "-device scsi-hd,drive=hd")
+    fi
+
     # Note: the goofiness around the expansion of |incoming_option| is
     # to ensure that it is quoted if set, but _not_ quoted if
     # unset. (QEMU chokes on empty arguments).
@@ -197,7 +207,7 @@
       ${snapshot} \
       -net user,hostfwd=tcp::${FLAGS_ssh_port}-:22 \
       ${incoming} ${incoming_option:+"$incoming_option"} \
-      -drive "file=${vm_image},index=0,media=disk,cache=${cache_type}"
+      ${drive}
 
     info "KVM started with pid stored in ${KVM_PID_FILE}"
     LIVE_VM_IMAGE="${vm_image}"