Changeset 43387 in vbox for trunk/src/VBox/Main

Timestamp:

Sep 21, 2012 9:40:25 AM (12 years ago)

Author:

vboxsync

Message:

VMM: HM cleanup.

Location:

trunk/src/VBox/Main

Files:

• src-client/MachineDebuggerImpl.cpp (modified) (5 diffs)
• src-server/HostImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp

@@ -29 +29 @@
 #include <VBox/vmm/vm.h>
 #include <VBox/vmm/tm.h>
-#include <VBox/vmm/hwaccm.h>
+#include <VBox/vmm/hm.h>
 #include <VBox/err.h>
 #include <iprt/cpp/utils.h>
@@ -607 +607 @@
 
     if (pVM.isOk())
-        *aEnabled = HWACCMIsEnabled (pVM.raw());
+        *aEnabled = HMIsEnabled (pVM.raw());
     else
         *aEnabled = false;
@@ -632 +632 @@
 
     if (pVM.isOk())
-        *aEnabled = HWACCMR3IsNestedPagingActive (pVM.raw());
+        *aEnabled = HMR3IsNestedPagingActive (pVM.raw());
     else
         *aEnabled = false;
@@ -657 +657 @@
 
     if (pVM.isOk())
-        *aEnabled = HWACCMR3IsVPIDActive (pVM.raw());
+        *aEnabled = HMR3IsVPIDActive (pVM.raw());
     else
         *aEnabled = false;
@@ -1080 +1080 @@
         if (SUCCEEDED(hrc))
         {
-            int vrc = HWACCMR3InjectNMI(ptrVM);
+            int vrc = HMR3InjectNMI(ptrVM);
             if (RT_SUCCESS(vrc))
                 hrc = S_OK;
             else
-                hrc = setError(E_FAIL, tr("HWACCMR3InjectNMI failed with %Rrc"), vrc);
+                hrc = setError(E_FAIL, tr("HMR3InjectNMI failed with %Rrc"), vrc);
         }
     }

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -142 +142 @@
 #endif
 
-/* XXX Solaris: definitions in /usr/include/sys/regset.h clash with hwacc_svm.h */
+/* XXX Solaris: definitions in /usr/include/sys/regset.h clash with hm_svm.h */
 #undef DS
 #undef ES
@@ -151 +151 @@
 
 #include <VBox/usb.h>
-#include <VBox/vmm/hwacc_svm.h>
+#include <VBox/vmm/hm_svm.h>
 #include <VBox/err.h>
 #include <VBox/settings.h>