From fc621bf1c803cc344f9e0f0ca103689aa9a565a8 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Wed, 1 Apr 2015 15:29:18 -0400
Subject: [PATCH] VBOX: Clean-up Vbox 4.2/4.3/5.0 support.

---
 samples/vboxwrapper/vbox_mscom_impl.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/samples/vboxwrapper/vbox_mscom_impl.cpp b/samples/vboxwrapper/vbox_mscom_impl.cpp
index a6582aa83f..ae7364234d 100644
--- a/samples/vboxwrapper/vbox_mscom_impl.cpp
+++ b/samples/vboxwrapper/vbox_mscom_impl.cpp
@@ -428,17 +428,16 @@ int VBOX_VM::create_vm() {
     // Tweak the VM's USB Configuration
     //
     vboxlog_msg("Disabling USB Support for VM.");
-#ifdef _VIRTUALBOX43_
-    rc = pMachine->GetUSBControllerCountByType(USBControllerType_OHCI, &lOHCICtrls);
-    if (SUCCEEDED(rc) && lOHCICtrls) {
-        pMachine->RemoveUSBController(CComBSTR("OHCI"));
-    }
-#endif
 #ifdef _VIRTUALBOX42_
     rc = pMachine->get_USBController(&pUSBContoller);
     if (SUCCEEDED(rc)) {
         pUSBContoller->put_Enabled(FALSE);
     }
+#else
+    rc = pMachine->GetUSBControllerCountByType(USBControllerType_OHCI, &lOHCICtrls);
+    if (SUCCEEDED(rc) && lOHCICtrls) {
+        pMachine->RemoveUSBController(CComBSTR("OHCI"));
+    }
 #endif
 
     // Tweak the VM's COM Port Support
@@ -1007,16 +1006,15 @@ int VBOX_VM::deregister_vm(bool delete_media) {
                 pMedium->Close();
             }
 
-#ifdef _VIRTUALBOX43_
-            pMachineRO->DeleteConfig(pEmptyHardDisks, &pProgress);
+#ifdef _VIRTUALBOX42_
+            pMachineRO->Delete(pEmptyHardDisks, &pProgress);
             if (SUCCEEDED(rc)) {
                 pProgress->WaitForCompletion(-1);
             } else {
                 CHECK_ERROR(rc);
             }
-#endif
-#ifdef _VIRTUALBOX42_
-            pMachineRO->Delete(pEmptyHardDisks, &pProgress);
+#else
+            pMachineRO->DeleteConfig(pEmptyHardDisks, &pProgress);
             if (SUCCEEDED(rc)) {
                 pProgress->WaitForCompletion(-1);
             } else {