cros_vm_lib: always use virtio_gpu
cirrus support has been removed, virtio_gpu is the only supported
option.
This fixes cros_vm_test which is failing because the board is not
specified by the chromite calling code, so qemu uses cirrus by default.
This in turns breaks Chrome, so system services (e.g. update_engine)
aren't started.
BUG=chromium:779267
BUG=chromium:782052
BUG=chromium:710629
TEST=cros_vm_test on novato passes
Change-Id: I87b1e03e8cc60169ad9bc47433c4b270233c60e8
Reviewed-on: https://chromium-review.googlesource.com/761416
Commit-Ready: Nicolas Norvez <norvez@chromium.org>
Tested-by: Nicolas Norvez <norvez@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/lib/cros_vm_lib.sh b/lib/cros_vm_lib.sh
index 14f4518..c7d1397 100644
--- a/lib/cros_vm_lib.sh
+++ b/lib/cros_vm_lib.sh
@@ -166,16 +166,6 @@
;;
esac
- # Use virtio-gpu instead of cirrus if the board supports it.
- case "${board}" in
- amd64-generic|betty*|newbie|novato*)
- video_card="virtio"
- ;;
- *)
- video_card="cirrus"
- ;;
- esac
-
# Override default pid file.
local start_vm=0
[ -n "${FLAGS_kvm_pid}" ] && KVM_PID_FILE=${FLAGS_kvm_pid}
@@ -304,7 +294,7 @@
local cmd=(
"${KVM_BINARY}" ${kvm_flag} -m 2G
-smp 4
- -vga "${video_card}"
+ -vga virtio
-pidfile "${KVM_PID_FILE}"
-chardev pipe,id=control_pipe,path="${KVM_PIPE_PREFIX}"
-serial "file:${KVM_SERIAL_FILE}"
