vbox的更動 80274 路徑 trunk/src/VBox/VMM/VMMRZ/VMMRZ.cpp

時間撮記:

2019-8-14 下午02:34:38 (5 年 以前)

作者:

vboxsync

訊息:

VMM: Refactoring VMMR0/* and VMMRZ/* to use VMCC & VMMCPUCC. bugref:9217

檔案:

• trunk/src/VBox/VMM/VMMRZ/VMMRZ.cpp (修改) (9 筆差異)

trunk/src/VBox/VMM/VMMRZ/VMMRZ.cpp

@@ -20 +20 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define VBOX_BUGREF_9217_PART_I
+#define LOG_GROUP LOG_GROUP_VMM
 #include <VBox/vmm/vmm.h>
 #include "VMMInternal.h"
-#include <VBox/vmm/vm.h>
+#include <VBox/vmm/vmcc.h>
 #include <VBox/err.h>
 
@@ -44 +46 @@
  * @param   uArg            The argument to the operation.
  */
-VMMRZDECL(int) VMMRZCallRing3(PVM pVM, PVMCPU pVCpu, VMMCALLRING3 enmOperation, uint64_t uArg)
+VMMRZDECL(int) VMMRZCallRing3(PVMCC pVM, PVMCPUCC pVCpu, VMMCALLRING3 enmOperation, uint64_t uArg)
 {
     VMCPU_ASSERT_EMT(pVCpu);
@@ -116 +118 @@
  * @param   uArg            The argument to the operation.
  */
-VMMRZDECL(int) VMMRZCallRing3NoCpu(PVM pVM, VMMCALLRING3 enmOperation, uint64_t uArg)
+VMMRZDECL(int) VMMRZCallRing3NoCpu(PVMCC pVM, VMMCALLRING3 enmOperation, uint64_t uArg)
 {
     return VMMRZCallRing3(pVM, VMMGetCpu(pVM), enmOperation, uArg);
@@ -128 +130 @@
  * @thread  EMT.
  */
-VMMRZDECL(void) VMMRZCallRing3Disable(PVMCPU pVCpu)
+VMMRZDECL(void) VMMRZCallRing3Disable(PVMCPUCC pVCpu)
 {
     VMCPU_ASSERT_EMT(pVCpu);
@@ -164 +166 @@
  * @thread  EMT.
  */
-VMMRZDECL(void) VMMRZCallRing3Enable(PVMCPU pVCpu)
+VMMRZDECL(void) VMMRZCallRing3Enable(PVMCPUCC pVCpu)
 {
     VMCPU_ASSERT_EMT(pVCpu);
@@ -198 +200 @@
  * @param   pVCpu               The cross context virtual CPU structure of the calling EMT.
  */
-VMMRZDECL(bool) VMMRZCallRing3IsEnabled(PVMCPU pVCpu)
+VMMRZDECL(bool) VMMRZCallRing3IsEnabled(PVMCPUCC pVCpu)
 {
     VMCPU_ASSERT_EMT(pVCpu);
@@ -215 +217 @@
  * @return VBox status code.
  */
-VMMRZDECL(int) VMMRZCallRing3SetNotification(PVMCPU pVCpu, R0PTRTYPE(PFNVMMR0CALLRING3NOTIFICATION) pfnCallback, RTR0PTR pvUser)
+VMMRZDECL(int) VMMRZCallRing3SetNotification(PVMCPUCC pVCpu, R0PTRTYPE(PFNVMMR0CALLRING3NOTIFICATION) pfnCallback, RTR0PTR pvUser)
 {
     AssertPtrReturn(pVCpu, VERR_INVALID_POINTER);
@@ -234 +236 @@
  * @param   pVCpu   The cross context virtual CPU structure.
  */
-VMMRZDECL(void) VMMRZCallRing3RemoveNotification(PVMCPU pVCpu)
+VMMRZDECL(void) VMMRZCallRing3RemoveNotification(PVMCPUCC pVCpu)
 {
     pVCpu->vmm.s.pfnCallRing3CallbackR0 = NULL;
@@ -246 +248 @@
  * @returns true if there the notification is active, false otherwise.
  */
-VMMRZDECL(bool) VMMRZCallRing3IsNotificationSet(PVMCPU pVCpu)
+VMMRZDECL(bool) VMMRZCallRing3IsNotificationSet(PVMCPUCC pVCpu)
 {
     return pVCpu->vmm.s.pfnCallRing3CallbackR0 != NULL;