Robustify starting of ssh connection to vm updater.

lib/cros_vm_lib.sh

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Common vm functions for use in crosutils.
 
 DEFINE_string kvm_pid "" \
   "Use this pid file.  If it exists and is set, use the vm specified by pid."
 DEFINE_boolean no_graphics ${FLAGS_FALSE} "Runs the KVM instance silently."
 DEFINE_boolean persist "${FLAGS_FALSE}" "Persist vm."
@@ skipping 82 matching lines @@
 function ssh_ping() {
   "${SCRIPT_ROOT}/ssh_test.sh" \
     --ssh_port=${FLAGS_ssh_port} \
     --remote=127.0.0.1 >&2
 }
 
 # Tries to ssh into live image $1 times.  After first failure, a try involves
 # shutting down and restarting kvm.
 function retry_until_ssh() {
   local can_ssh_into=1
+  local max_retries=3
   local retries=0
   ssh_ping && can_ssh_into=0
 
-  while [ ${can_ssh_into} -eq 1 ] && [ ${retries} -lt ${1} ]; do
+  while [ ${can_ssh_into} -eq 1 ] && [ ${retries} -lt ${max_retries} ]; do
     echo "Failed to connect to virtual machine, retrying ... " >&2
     stop_kvm || echo "Could not stop kvm.  Retrying anyway." >&2
     start_kvm "${LIVE_VM_IMAGE}"
     ssh_ping && can_ssh_into=0
     retries=$((retries + 1))
   done
   return ${can_ssh_into}
 }
 
 function stop_kvm() {
   if [ "${FLAGS_persist}" -eq "${FLAGS_TRUE}" ]; then
     echo "Persist requested.  Use --ssh_port ${FLAGS_ssh_port} " \
       "--kvm_pid ${KVM_PID_FILE} to re-connect to it." >&2
   else
     echo "Stopping the KVM instance" >&2
     local pid=$(get_pid)
     if [ -n "${pid}" ]; then
       echo "Killing ${pid}" >&2
       blocking_kill ${pid} 1 16 || blocking_kill 9 1
       sudo rm "${KVM_PID_FILE}"
     else
       echo "No kvm pid found to stop." >&2
       return 1
     fi
   fi
 }