Changeset 80281 in vbox for trunk/src/VBox/VMM/VMMAll/HMAll.cpp

Timestamp:

Aug 15, 2019 7:29:37 AM (5 years ago)

Author:

vboxsync

Message:

VMM,++: Refactoring code to use VMMC & VMMCPUCC. bugref:9217

File:

• trunk/src/VBox/VMM/VMMAll/HMAll.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VMMAll/HMAll.cpp

@@ -323 +323 @@
  *
  * @returns @c true if it is suitable, @c false otherwise.
+ * @param   pVM     The cross context VM structure.
  * @param   pVCpu   The cross context virtual CPU structure.
  * @param   pCtx    Pointer to the guest CPU context.
@@ -329 +330 @@
  *          pVCpu->cpum.GstCtx.
  */
-VMMDECL(bool) HMCanExecuteGuest(PVMCPUCC pVCpu, PCCPUMCTX pCtx)
-{
-    PVM pVM = pVCpu->CTX_SUFF(pVM);
+VMMDECL(bool) HMCanExecuteGuest(PVMCC pVM, PVMCPUCC pVCpu, PCCPUMCTX pCtx)
+{
     Assert(HMIsEnabled(pVM));
 
@@ -380 +380 @@
  * @param   GCVirt      Page to invalidate.
  */
-VMM_INT_DECL(int) HMInvalidatePage(PVMCPU pVCpu, RTGCPTR GCVirt)
+VMM_INT_DECL(int) HMInvalidatePage(PVMCPUCC pVCpu, RTGCPTR GCVirt)
 {
     STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushPageManual);
@@ -514 +514 @@
     for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
     {
-        PVMCPU pVCpu = VMCC_GET_CPU(pVM, idCpu);
+        PVMCPUCC pVCpu = VMCC_GET_CPU(pVM, idCpu);
 
         /* Nothing to do if a TLB flush is already pending; the VCPU should
@@ -551 +551 @@
     for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
     {
-        PVMCPU pVCpu = VMCC_GET_CPU(pVM, idCpu);
+        PVMCPUCC pVCpu = VMCC_GET_CPU(pVM, idCpu);
 
         /* Nothing to do if a TLB flush is already pending; the VCPU should
@@ -702 +702 @@
  * @param   pVM         The cross context VM structure.
  */
-VMM_INT_DECL(bool) HMHasPendingIrq(PVM pVM)
-{
-    PVMCPU pVCpu = VMMGetCpu(pVM);
+VMM_INT_DECL(bool) HMHasPendingIrq(PVMCC pVM)
+{
+    PVMCPUCC pVCpu = VMMGetCpu(pVM);
     return !!pVCpu->hm.s.Event.fPending;
 }