Changeset 92392 in vbox for trunk/include

Timestamp:

Nov 12, 2021 10:39:56 AM (3 years ago)

Author:

vboxsync

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

148246

Message:

VMM: Removed the callring-3 API and some of the associated stuff. bugref:10093

Location:

trunk/include/VBox

Files:

• err.h (modified) (1 diff)
• err.mac (modified) (1 diff)
• vmm/vmm.h (modified) (3 diffs)

trunk/include/VBox/err.h

@@ -1258 +1258 @@
  * @{
  */
-/** Reason for leaving RZ: Calling host function. */
-#define VINF_VMM_CALL_HOST                  2700
 /** Reason for leaving R0: Hit a ring-0 assertion on EMT. */
 #define VERR_VMM_RING0_ASSERTION            (-2701)

trunk/include/VBox/err.mac

@@ -488 +488 @@
 %define VERR_IOM_MMIO_REGION_ALREADY_MAPPED    (-2662)
 %define VERR_IOM_MMIO_REGION_NOT_MAPPED    (-2663)
-%define VINF_VMM_CALL_HOST    2700
 %define VERR_VMM_RING0_ASSERTION    (-2701)
 %define VERR_VMM_HYPER_CR3_MISMATCH    (-2702)

trunk/include/VBox/vmm/vmm.h

@@ -49 +49 @@
 
 /**
- * VMMRZCallRing3 operations.
- */
-typedef enum VMMCALLRING3
-{
-    /** Invalid operation.  */
-    VMMCALLRING3_INVALID = 0,
-    /** Signal a ring 0 assertion. */
-    VMMCALLRING3_VM_R0_ASSERTION,
-    /** The usual 32-bit hack. */
-    VMMCALLRING3_32BIT_HACK = 0x7fffffff
-} VMMCALLRING3;
-
-/**
- * VMMRZCallRing3 notification callback.
+ * Ring-0 assertion notification callback.
  *
  * @returns VBox status code.
  * @param   pVCpu           The cross context virtual CPU structure.
- * @param   enmOperation    The operation causing the ring-3 jump.
  * @param   pvUser          The user argument.
  */
-typedef DECLCALLBACKTYPE(int, FNVMMR0CALLRING3NOTIFICATION,(PVMCPUCC pVCpu, VMMCALLRING3 enmOperation, void *pvUser));
-/** Pointer to a FNRTMPNOTIFICATION(). */
-typedef FNVMMR0CALLRING3NOTIFICATION *PFNVMMR0CALLRING3NOTIFICATION;
+typedef DECLCALLBACKTYPE(int, FNVMMR0ASSERTIONNOTIFICATION,(PVMCPUCC pVCpu, void *pvUser));
+/** Pointer to a FNVMMR0ASSERTIONNOTIFICATION(). */
+typedef FNVMMR0ASSERTIONNOTIFICATION *PFNVMMR0ASSERTIONNOTIFICATION;
 
 /**
@@ -513 +499 @@
 VMMR0_INT_DECL(int)  VMMR0EmtSignalSupEvent(PGVM pGVM, PGVMCPU pGVCpu, SUPSEMEVENT hEvent);
 VMMR0_INT_DECL(int)  VMMR0EmtSignalSupEventByGVM(PGVM pGVM, SUPSEMEVENT hEvent);
+VMMR0_INT_DECL(int)  VMMR0AssertionSetNotification(PVMCPUCC pVCpu, PFNVMMR0ASSERTIONNOTIFICATION pfnCallback, RTR0PTR pvUser);
+VMMR0_INT_DECL(void) VMMR0AssertionRemoveNotification(PVMCPUCC pVCpu);
+VMMR0_INT_DECL(bool) VMMR0AssertionIsNotificationSet(PVMCPUCC pVCpu);
 
 /** @name VMMR0EMTWAIT_F_XXX - flags for VMMR0EmtWaitEventInner and friends.
@@ -592 +581 @@
  * @{
  */
-VMMRZDECL(int)      VMMRZCallRing3(PVMCC pVMCC, PVMCPUCC pVCpu, VMMCALLRING3 enmOperation, uint64_t uArg);
-VMMRZDECL(int)      VMMRZCallRing3NoCpu(PVMCC pVM, VMMCALLRING3 enmOperation, uint64_t uArg);
 VMMRZDECL(void)     VMMRZCallRing3Disable(PVMCPUCC pVCpu);
 VMMRZDECL(void)     VMMRZCallRing3Enable(PVMCPUCC pVCpu);
 VMMRZDECL(bool)     VMMRZCallRing3IsEnabled(PVMCPUCC pVCpu);
-VMMRZDECL(int)      VMMRZCallRing3SetNotification(PVMCPUCC pVCpu, R0PTRTYPE(PFNVMMR0CALLRING3NOTIFICATION) pfnCallback, RTR0PTR pvUser);
-VMMRZDECL(void)     VMMRZCallRing3RemoveNotification(PVMCPUCC pVCpu);
-VMMRZDECL(bool)     VMMRZCallRing3IsNotificationSet(PVMCPUCC pVCpu);
 /** @} */
 #endif