From fa7ebdca4e560a72d65692522039be8fe589246e Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Sat, 12 Jul 2014 15:27:03 -0400
Subject: [PATCH] VBOX: Do not go off the rails if a process handle cannot be
 obtained for the VM process.  Changing process priority of a Virtualbox
 4.3.14 VM does not currently work.

---
 samples/vboxwrapper/vbox.cpp | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/samples/vboxwrapper/vbox.cpp b/samples/vboxwrapper/vbox.cpp
index d1bcaf5a7c..f066dfb924 100644
--- a/samples/vboxwrapper/vbox.cpp
+++ b/samples/vboxwrapper/vbox.cpp
@@ -1230,11 +1230,7 @@ int VBOX_VM::start() {
 
         get_vm_process_id();
 
-#ifdef _WIN32
-        if (vm_pid && vm_pid_handle) break;
-#else
         if (vm_pid) break;
-#endif
 
         if (timeout > 45) {
             retval = ERR_TIMEOUT;
@@ -2022,10 +2018,8 @@ int VBOX_VM::get_vm_process_id() {
     string pid;
     size_t pid_start;
     size_t pid_end;
-    int retval;
 
-    retval = get_vm_log(output, false);
-    if (retval) return retval;
+    get_vm_log(output, false);
 
     // Output should look like this:
     // VirtualBox 4.1.0 r73009 win.amd64 (Jul 19 2011 13:05:53) release log
@@ -2177,7 +2171,7 @@ int VBOX_VM::get_system_log(string& log, bool tail_only) {
     } else {
         fprintf(
             stderr,
-            "%s ERROR: Stale VirtualBox System Log used.\n",
+            "%s WARNING: Stale VirtualBox System Log used.\n",
             vboxwrapper_msg_prefix(buf, sizeof(buf))
         );
     }
@@ -2208,7 +2202,7 @@ int VBOX_VM::get_system_log(string& log, bool tail_only) {
     } else {
         fprintf(
             stderr,
-            "%s ERROR: Stale VirtualBox System Log Not Found.\n",
+            "%s WARNING: Stale VirtualBox System Log Not Found.\n",
             vboxwrapper_msg_prefix(buf, sizeof(buf))
         );
         retval = ERR_NOT_FOUND;
@@ -2239,7 +2233,7 @@ int VBOX_VM::get_vm_log(string& log, bool tail_only) {
     } else {
         fprintf(
             stderr,
-            "%s ERROR: Stale VirtualBox VM Log used.\n",
+            "%s WARNING: Stale VirtualBox VM Log used.\n",
             vboxwrapper_msg_prefix(buf, sizeof(buf))
         );
     }
@@ -2271,7 +2265,7 @@ int VBOX_VM::get_vm_log(string& log, bool tail_only) {
     } else {
         fprintf(
             stderr,
-            "%s ERROR: Stale VirtualBox VM Log Not Found.\n",
+            "%s WARNING: Stale VirtualBox VM Log Not Found.\n",
             vboxwrapper_msg_prefix(buf, sizeof(buf))
         );
         retval = ERR_NOT_FOUND;