Changeset 45620 in vbox for trunk/include/VBox

Timestamp:

Apr 18, 2013 8:07:14 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

85123

Message:

CSAM,PATM: Don't bother initializing anything if HMIsEnabled(). Also, don't allow the components to be enabled.

Location:

trunk/include/VBox

Files:

• err.h (modified) (2 diffs)
• vmm/patm.h (modified) (1 diff)

trunk/include/VBox/err.h

@@ -360 +360 @@
 /** Continue execution after patch trap. */
 #define VINF_PATCH_CONTINUE                 (1430)
+/** The patch manager is not used because we're using HM and VT-x/AMD-V. */
+#define VERR_PATM_HM_IPE                    (-1431)
 
 /** @} */
@@ -375 +377 @@
 /** Reason for leaving RC: CSAM wants perform a task in ring-3. */
 #define VINF_CSAM_PENDING_ACTION            1503
+/** The CSAM is not used because we're using HM and VT-x/AMD-V. */
+#define VERR_CSAM_HM_IPE                    (-1504)
 /** @} */
 

trunk/include/VBox/vmm/patm.h

@@ -147 +147 @@
 VMM_INT_DECL(uint32_t)  PATMRawGetEFlags(PVM pVM, PCCPUMCTXCORE pCtxCore);
 VMM_INT_DECL(void)      PATMRawSetEFlags(PVM pVM, PCPUMCTXCORE pCtxCore, uint32_t efl);
-VMM_INT_DECL(RCPTRTYPE(PPATMGCSTATE)) PATMQueryGCState(PVM pVM);
+VMM_INT_DECL(RCPTRTYPE(PPATMGCSTATE)) PATMGetGCState(PVM pVM);
 VMM_INT_DECL(bool)      PATMShouldUseRawMode(PVM pVM, RTRCPTR pAddrGC);
 VMM_INT_DECL(int)       PATMSetMMIOPatchInfo(PVM pVM, RTGCPHYS GCPhys, RTRCPTR pCachedData);