Changeset 70977 in vbox for trunk/include

Timestamp:

Feb 12, 2018 8:45:31 PM (7 years ago)

Author:

vboxsync

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

120824

Message:

NEM: Working on PGM notifications. bugref:9044

Location:

trunk/include

Files:

• VBox/vmm/hm.h (modified) (1 diff)
• VBox/vmm/nem.h (modified) (3 diffs)
• VBox/vmm/pgm.h (modified) (1 diff)
• VBox/vmm/vm.h (modified) (2 diffs)
• iprt/nt/nt.h (modified) (3 diffs)
• iprt/win/windows.h (modified) (1 diff)

trunk/include/VBox/vmm/hm.h

@@ -49 +49 @@
  *
  * @param   a_pVM       The cross context VM structure.
- * @sa      VM_IS_HM_OR_NEM_ENABLED, VM_IS_RAW_MODE_ENABLED,
- *          HMIsEnabledNotMacro, HMR3IsEnabled
+ * @deprecated Please use VM_IS_RAW_MODE_ENABLED, VM_IS_HM_OR_NEM_ENABLED, or
+ *             VM_IS_HM_ENABLED instead.
  * @internal
  */

trunk/include/VBox/vmm/nem.h

@@ -53 +53 @@
 
 VMMR3_INT_DECL(int)  NEMR3NotifyPhysRamRegister(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb);
-VMMR3_INT_DECL(int)  NEMR3NotifyPhysMmioExMap(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, uint32_t fFlags);
+VMMR3_INT_DECL(int)  NEMR3NotifyPhysMmioExMap(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, uint32_t fFlags, void *pvMmio2);
 VMMR3_INT_DECL(int)  NEMR3NotifyPhysMmioExUnmap(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, uint32_t fFlags);
 /** @name Flags for NEMR3NotifyPhysMmioExMap and NEMR3NotifyPhysMmioExUnmap.
@@ -63 +63 @@
 /** @} */
 
-VMMR3_INT_DECL(int)  NEMR3NotifyPhysRomRegisterEarly(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, uint32_t fFlags);
-VMMR3_INT_DECL(int)  NEMR3NotifyPhysRomRegisterLate(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, uint32_t fFlags);
+VMMR3_INT_DECL(int)  NEMR3NotifyPhysRomRegisterEarly(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, uint32_t fFlags);
+VMMR3_INT_DECL(int)  NEMR3NotifyPhysRomRegisterLate(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, uint32_t fFlags);
 /** @name Flags for NEMR3NotifyPhysRomRegisterEarly and NEMR3NotifyPhysRomRegisterLate.
  * @{ */
@@ -84 +84 @@
 VMM_INT_DECL(void) NEMHCNotifyHandlerPhysicalModify(PVM pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhysOld,
                                                     RTGCPHYS GCPhysNew, RTGCPHYS cb, bool fRestoreAsRAM);
+
+VMM_INT_DECL(int)  NEMHCNotifyPhysPageAllocated(PVM pVM, RTGCPHYS GCPhys, RTHCPHYS HCPhys, uint32_t fPageProt,
+                                                PGMPAGETYPE enmType, uint8_t *pu2State);
+VMM_INT_DECL(void) NEMHCNotifyPhysPageProtChanged(PVM pVM, RTGCPHYS GCPhys, RTHCPHYS HCPhys, uint32_t fPageProt,
+                                                  PGMPAGETYPE enmType, uint8_t *pu2State);
+VMM_INT_DECL(void) NEMHCNotifyPhysPageChanged(PVM pVM, RTGCPHYS GCPhys, RTHCPHYS HCPhysPrev, RTHCPHYS HCPhysNew,
+                                              uint32_t fPageProt, PGMPAGETYPE enmType, uint8_t *pu2State);
+/** @name NEM_PAGE_PROT_XXX - Page protection
+ * @{ */
+#define NEM_PAGE_PROT_NONE      UINT32_C(0)     /**< All access causes VM exits. */
+#define NEM_PAGE_PROT_READ      RT_BIT(0)       /**< Read access. */
+#define NEM_PAGE_PROT_EXECUTE   RT_BIT(1)       /**< Execute access. */
+#define NEM_PAGE_PROT_WRITE     RT_BIT(2)       /**< write access. */
+/** @} */
+
 /** @} */
 

trunk/include/VBox/vmm/pgm.h

@@ -516 +516 @@
 } PGMPAGETYPE;
 AssertCompile(PGMPAGETYPE_END == 8);
+
+/** @name PGM page type predicates.
+ * @{ */
+#define PGMPAGETYPE_IS_READABLE(a_enmType)  ( (a_enmType) <= PGMPAGETYPE_ROM )
+#define PGMPAGETYPE_IS_WRITEABLE(a_enmType) ( (a_enmType) <= PGMPAGETYPE_ROM_SHADOW )
+#define PGMPAGETYPE_IS_RWX(a_enmType)       ( (a_enmType) <= PGMPAGETYPE_ROM_SHADOW )
+#define PGMPAGETYPE_IS_ROX(a_enmType)       ( (a_enmType) == PGMPAGETYPE_ROM )
+#define PGMPAGETYPE_IS_NP(a_enmType)        ( (a_enmType) == PGMPAGETYPE_MMIO )
+/** @} */
+
 
 VMM_INT_DECL(PGMPAGETYPE) PGMPhysGetPageType(PVM pVM, RTGCPHYS GCPhys);

trunk/include/VBox/vmm/vm.h

@@ -965 +965 @@
  *
  * @param   a_pVM       The cross context VM structure.
- * @sa      HMR3IsEnabled, HMIsEnabled
+ * @sa      VM_IS_HM_OR_NEM_ENABLED, VM_IS_HM_ENABLED, VM_IS_NEM_ENABLED.
  * @internal
  */
@@ -981 +981 @@
  *
  * @param   a_pVM       The cross context VM structure.
- * @sa      VM_IS_RAW_MODE_ENABLED, HMIsEnabled, HMR3IsEnabled
+ * @sa      VM_IS_RAW_MODE_ENABLED, VM_IS_HM_ENABLED, VM_IS_NEM_ENABLED.
  * @internal
  */
 #define VM_IS_HM_OR_NEM_ENABLED(a_pVM)      ((a_pVM)->bMainExecutionEngine != VM_EXEC_ENGINE_RAW_MODE)
+
+/**
+ * Checks whether HM is being used by this VM.
+ *
+ * @retval  true if HM (VT-x/AMD-v) is used.
+ * @retval  false if not.
+ *
+ * @param   a_pVM       The cross context VM structure.
+ * @sa      VM_IS_NEM_ENABLED, VM_IS_RAW_MODE_ENABLED, VM_IS_HM_OR_NEM_ENABLED.
+ * @internal
+ */
+#define VM_IS_HM_ENABLED(a_pVM)             ((a_pVM)->bMainExecutionEngine == VM_EXEC_ENGINE_HW_VIRT)
+
+/**
+ * Checks whether NEM is being used by this VM.
+ *
+ * @retval  true if a native hypervisor API is used.
+ * @retval  false if not.
+ *
+ * @param   a_pVM       The cross context VM structure.
+ * @sa      VM_IS_HM_ENABLED, VM_IS_RAW_MODE_ENABLED, VM_IS_HM_OR_NEM_ENABLED.
+ * @internal
+ */
+#define VM_IS_NEM_ENABLED(a_pVM)             ((a_pVM)->bMainExecutionEngine == VM_EXEC_ENGINE_NATIVE_API)
 
 

trunk/include/iprt/nt/nt.h

@@ -137 +137 @@
 # pragma warning(pop)
 
+# ifndef OBJ_DONT_REPARSE
+#  define RTNT_NEED_CLIENT_ID
+# endif
 
 # undef _FILE_INFORMATION_CLASS
@@ -503 +506 @@
 
 
-#ifdef IPRT_NT_USE_WINTERNL
+#ifdef RTNT_NEED_CLIENT_ID
 typedef struct _CLIENT_ID
 {
@@ -509 +512 @@
     HANDLE UniqueThread;
 } CLIENT_ID;
+#endif
+#ifdef IPRT_NT_USE_WINTERNL
 typedef CLIENT_ID *PCLIENT_ID;
 #endif

trunk/include/iprt/win/windows.h

@@ -35 +35 @@
 # pragma warning(push)
 # pragma warning(disable:4668)
+# pragma warning(disable:4480) /* W10/wincrypt.h(9193) : warning C4480: nonstandard extension used: specifying underlying type for enum 'CertKeyType' */
 # if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
 #  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */