Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(383)

Unified Diff: lib/cros_vm_lib.sh

Issue 5928005: Fixes to get ctest up and running again. (Closed) Base URL: http://git.chromium.org/git/crosutils.git@master
Patch Set: no verbose Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « bin/ctest.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/cros_vm_lib.sh
diff --git a/lib/cros_vm_lib.sh b/lib/cros_vm_lib.sh
index 3048c3dd301e5de6969a9b03eb6ca92310e81f69..741c5feae5de2dcc410d125d3acc8d6fb6ab40bc 100644
--- a/lib/cros_vm_lib.sh
+++ b/lib/cros_vm_lib.sh
@@ -70,11 +70,17 @@ function start_kvm() {
snapshot="-snapshot"
fi
+ local net_option="-net nic,model=virtio"
+ if [ -f "$(dirname $1)/.use_e1000" ]; then
+ info "Detected older image, using e1000 instead of virtio."
+ net_option="-net nic,model=e1000"
+ fi
+
sudo kvm -m 1024 \
-vga std \
-pidfile "${KVM_PID_FILE}" \
-daemonize \
- -net nic,model=virtio \
+ ${net_option} \
${nographics} \
${snapshot} \
-net user,hostfwd=tcp::${FLAGS_ssh_port}-:22 \
« no previous file with comments | « bin/ctest.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698