Changeset 75440 in vbox for trunk/include/VBox/vmm

Timestamp:

Nov 14, 2018 6:23:13 AM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 Separate the VMX/SVM CPU spec. functions into CPUM as they can be called from IEM/REM/CPUM as well as HM.

Location:

trunk/include/VBox/vmm

Files:

• cpum.h (modified) (2 diffs)
• hm.h (modified) (2 diffs)

trunk/include/VBox/vmm/cpum.h

@@ -32 +32 @@
 #include <VBox/vmm/stam.h>
 #include <VBox/vmm/vmapi.h>
+#include <VBox/vmm/hm_svm.h>
+#include <VBox/vmm/hm_vmx.h>
 
 RT_C_DECLS_BEGIN
@@ -2069 +2071 @@
 VMMDECL(void)           CPUMRawSetEFlags(PVMCPU pVCpu, uint32_t fEfl);
 
+/** @name SVM helpers.
+ * @{ */
+VMM_INT_DECL(int)       CPUMSvmGetMsrpmOffsetAndBit(uint32_t idMsr, uint16_t *pbOffMsrpm, uint8_t *puMsrpmBit);
+VMM_INT_DECL(bool)      CPUMSvmIsIOInterceptActive(void *pvIoBitmap, uint16_t u16Port, SVMIOIOTYPE enmIoType, uint8_t cbReg,
+                                                   uint8_t cAddrSizeBits, uint8_t iEffSeg, bool fRep, bool fStrIo,
+                                                   PSVMIOIOEXITINFO pIoExitInfo);
+/** @} */
+
+/** @name VMX helpers.
+ * @{ */
+VMM_INT_DECL(int)       CPUMVmxGetMsrPermission(void const *pvMsrBitmap, uint32_t idMsr, PVMXMSREXITREAD penmRead,
+                                                PVMXMSREXITWRITE penmWrite);
+VMM_INT_DECL(bool)      CPUMVmxGetIoBitmapPermission(void const *pvIoBitmapA, void const *pvIoBitmapB, uint16_t uPort,
+                                                     uint8_t cbAccess);
+/** @} */
+
 /** @name Changed flags.
  * These flags are used to keep track of which important register that

trunk/include/VBox/vmm/hm.h

@@ -141 +141 @@
 
 /** @name All-context VMX helpers.
- * These are VMX functions (based on VMX specs.) that may be used by IEM/REM and
- * not VirtualBox functions that are used for hardware-assisted VMX. Those are
- * declared below under the !IN_RC section.
+ *
+ * These are hardware-assisted VMX functions (used by IEM/REM/CPUM and HM). Helpers
+ * based purely on the Intel VT-x specification (used by IEM/REM and HM) can be
+ * found in CPUM.
  * @{ */
 VMM_INT_DECL(int)               HMVmxGetHostMsrs(PVM pVM, PVMXMSRS pVmxMsrs);
@@ -150 +151 @@
 VMM_INT_DECL(int)               HMVmxEntryIntInfoInjectTrpmEvent(PVMCPU pVCpu, uint32_t uEntryIntInfo, uint32_t uErrCode,
                                                                  uint32_t cbInstr, RTGCUINTPTR GCPtrFaultAddress);
-VMM_INT_DECL(int)               HMVmxGetMsrPermission(void const *pvMsrBitmap, uint32_t idMsr, PVMXMSREXITREAD penmRead,
-                                                      PVMXMSREXITWRITE penmWrite);
-VMM_INT_DECL(bool)              HMVmxGetIoBitmapPermission(void const *pvIoBitmapA, void const *pvIoBitmapB, uint16_t uPort,
-                                                           uint8_t cbAccess);
 /** @} */
 
 /** @name All-context SVM helpers.
  *
- * These are SVM functions (based on AMD specs.) that may be used by IEM/REM and
- * not VirtualBox functions that are used for hardware-assisted SVM. Those are
- * declared below under the !IN_RC section.
+ * These are hardware-assisted SVM functions (used by IEM/REM/CPUM and HM). Helpers
+ * based purely on the AMD SVM specification (used by IEM/REM and HM) can be found
+ * in CPUM.
  * @{ */
 VMM_INT_DECL(TRPMEVENT)         HMSvmEventToTrpmEventType(PCSVMEVENT pSvmEvent);
-VMM_INT_DECL(int)               HMSvmGetMsrpmOffsetAndBit(uint32_t idMsr, uint16_t *pbOffMsrpm, uint8_t *puMsrpmBit);
-VMM_INT_DECL(bool)              HMSvmIsIOInterceptActive(void *pvIoBitmap, uint16_t u16Port, SVMIOIOTYPE enmIoType, uint8_t cbReg,
-                                                         uint8_t cAddrSizeBits, uint8_t iEffSeg, bool fRep, bool fStrIo,
-                                                         PSVMIOIOEXITINFO pIoExitInfo);
 /** @} */