From ea569930936547b094161999f2bac401edb0bbfb Mon Sep 17 00:00:00 2001
From: Rom Walton <romw@romwnet.org>
Date: Fri, 6 Dec 2013 13:22:17 -0500
Subject: [PATCH] VBOX: When disabling hardware acceleration because of legacy
 support, write that to stderr and suggest that the volunteer upgrade to BOINC
 7.2.

---
 samples/vboxwrapper/vbox.cpp  | 8 +++++++-
 win_build/vboxwrapper.vcxproj | 8 ++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/samples/vboxwrapper/vbox.cpp b/samples/vboxwrapper/vbox.cpp
index 707db448e9..0358084627 100644
--- a/samples/vboxwrapper/vbox.cpp
+++ b/samples/vboxwrapper/vbox.cpp
@@ -608,6 +608,12 @@ int VBOX_VM::register_vm() {
         if (vm_cpu_count == "1") {
             // Keep this around for older clients.  Removing this for older clients might
             // lead to a machine that will only return crashed VM reports.
+            fprintf(
+                stderr,
+                "%s Legacy fallback configuration detected. Disabling VirtualBox hardware acceleration support.\n"
+                "%s NOTE: Upgrading to BOINC 7.2 or better may re-enable hardware acceleration.\n",
+                boinc_msg_prefix(buf, sizeof(buf))
+            );
             disable_acceleration = true;
         }
     }
@@ -631,7 +637,7 @@ int VBOX_VM::register_vm() {
         if (disable_acceleration) {
             fprintf(
                 stderr,
-                "%s ERROR: Invalid project configuration.  VM type requires acceleration but hardware cannot support it.\n",
+                "%s ERROR: Invalid configuration.  VM type requires acceleration but the current configuration cannot support it.\n",
                 vboxwrapper_msg_prefix(buf, sizeof(buf))
             );
             return ERR_INVALID_PARAM;
diff --git a/win_build/vboxwrapper.vcxproj b/win_build/vboxwrapper.vcxproj
index e09bfe5576..df8f697ea6 100644
--- a/win_build/vboxwrapper.vcxproj
+++ b/win_build/vboxwrapper.vcxproj
@@ -128,12 +128,12 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>libcmt.lib;libcpmt.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;wsock32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26051_windows_intelx86.exe</OutputFile>
+      <OutputFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26052_windows_intelx86.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26051_windows_intelx86.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26052_windows_intelx86.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -177,12 +177,12 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>libcmt.lib;libcpmt.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;wsock32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26051_windows_x86_64.exe</OutputFile>
+      <OutputFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26052_windows_x86_64.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26051_windows_x86_64.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>.\Build\$(Platform)\$(Configuration)\vboxwrapper_26052_windows_x86_64.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>