From b7b095befd0588bfa62545db2873e890310c74eb Mon Sep 17 00:00:00 2001 From: John Sheu Date: Tue, 18 Dec 2012 13:30:26 -0800 Subject: [PATCH] Use cirrus driver for QEMU MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Moving to the cirrus driver (instead of std) so we can support cirrus-fb, in preparation for nonroot-X support. BUG=chromium-os:388 TEST=local build, run with x86-generic Change-Id: Ic7d5776f673ac3c15680d62331345d55985f1d73 Reviewed-on: https://gerrit.chromium.org/gerrit/39900 Reviewed-by: Stéphane Marchesin Reviewed-by: Chris Sosa Tested-by: John Sheu Commit-Queue: John Sheu --- image_to_vm.sh | 6 +++--- lib/cros_vm_lib.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/image_to_vm.sh b/image_to_vm.sh index 0adbbce769..6da1177136 100755 --- a/image_to_vm.sh +++ b/image_to_vm.sh @@ -241,7 +241,7 @@ fi if [ "${FLAGS_format}" == "qemu" ]; then echo "If you have qemu-kvm installed, you can start the image by:" - echo "sudo kvm -m ${FLAGS_mem} -vga std -pidfile /tmp/kvm.pid -net nic,model=virtio " \ - "-net user,hostfwd=tcp::9222-:22 \\" - echo " -hda ${FLAGS_to}/${DEFAULT_QEMU_IMAGE}" + echo "sudo kvm -m ${FLAGS_mem} -vga cirrus -pidfile /tmp/kvm.pid" \ + "-net nic,model=virtio -net user,hostfwd=tcp::9222-:22 \\" + echo "-hda ${FLAGS_to}/${DEFAULT_QEMU_IMAGE}" fi diff --git a/lib/cros_vm_lib.sh b/lib/cros_vm_lib.sh index b27351ded3..d47bfa8e83 100644 --- a/lib/cros_vm_lib.sh +++ b/lib/cros_vm_lib.sh @@ -97,7 +97,7 @@ start_kvm() { sudo "${KVM_BINARY}" -m 2G \ -smp 4 \ - -vga std \ + -vga cirrus \ -pidfile "${KVM_PID_FILE}" \ -daemonize \ ${net_option} \