commit c5b335f4f040e2be3c6cf413fe95de6e4b3567c1
author Po-Hsien Wang <pwang@chromium.org> Tue Feb 06 18:36:16 2018 -0800
committer chrome-bot <chrome-bot@chromium.org> Thu Feb 08 23:41:29 2018 -0800
tree 89b2e2e2929e6ad76d50d7422f5e01422cdef779
parent aa78bdf75a43ce39fe0b2c675eb5013ec6539c97

cros_vm: Fallback VM baseline to Sandybridge

As current lab still use baremetal with Sandybridge, downgrade it to
Sandybridge.

BUG=chromium:808045
TEST=None.
CQ-DEPEND=CL:905990
CQ-DEPEND=CL:906681

Change-Id: Iccba39213a8a9cb261956b21c3a7fd3b04619a28
Reviewed-on: https://chromium-review.googlesource.com/905993
Commit-Ready: Ilja H. Friedel <ihf@chromium.org>
Tested-by: Ilja H. Friedel <ihf@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>

scripts/cros_vm.py

diff --git a/scripts/cros_vm.py b/scripts/cros_vm.py
index ca2d379..0d2c8cb 100644
--- a/scripts/cros_vm.py
+++ b/scripts/cros_vm.py
@@ -419,8 +419,10 @@
     parser.add_argument('--qemu-smp', type=int, default='0',
                         help='SMP argument that will be passed to qemu. (0 '
                              'means auto-detection.)')
+    # TODO(pwang): replace SandyBridge to Haswell-noTSX once lab machine
+    # running VMTest all migrate to GCE.
     parser.add_argument('--qemu-cpu', type=str,
-                        default='Haswell-noTSX,-invpcid,-tsc-deadline',
+                        default='SandyBridge,-invpcid,-tsc-deadline',
                         help='CPU argument that will be passed to qemu.')
     parser.add_argument('--qemu-bios-path', type='path',
                         help='Path of directory with qemu bios files.')