Changeset 93043 in vbox

Timestamp:

Dec 21, 2021 11:38:47 AM (3 years ago)

Author:

vboxsync

Message:

VMM/VMXAllTemplate.cpp.h: Disable code which will be only used in R0, bugref:10136

File:

• trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h (modified) (29 diffs)

trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h

@@ -900 +900 @@
 }
 
-
+#ifdef IN_RING0
 /**
  * Sets the given Processor-based VM-execution controls.
@@ -967 +967 @@
     }
 }
-
+#endif
 
 /**
@@ -1253 +1253 @@
 
 
+#ifdef IN_RING0
 /**
  * Updates the VM's last error record.
@@ -1272 +1273 @@
         VMX_VMCS_READ_32(pVCpu, VMX_VMCS32_RO_VM_INSTR_ERROR, &VCPU_2_VMXSTATE(pVCpu).vmx.LastError.u32InstrError);
     }
-#ifdef IN_RING0
     pVCpu->CTX_SUFF(pVM)->hm.s.ForR3.rcInit = rc;
-#endif
-}
+}
+#endif
 
 
@@ -1547 +1547 @@
 #endif
 
+#ifdef IN_RING0
 /**
  * Sets the permission bits for the specified MSR in the given MSR bitmap.
@@ -1751 +1752 @@
     pHostMsr[i].u32Msr = idMsr;
 
-#ifdef IN_RING0
     /*
      * Only if the caller requests to update the host MSR value AND we've newly added the
@@ -1773 +1773 @@
         }
     }
-#else
-    RT_NOREF(fUpdateHostMsr);
-#endif
+
     return VINF_SUCCESS;
 }
@@ -1875 +1873 @@
     return false;
 }
+#endif
 
 
@@ -3040 +3039 @@
 
 
+#ifdef IN_RING0
 /**
  * Exports the guest's RSP into the guest-state area in the VMCS.
@@ -3060 +3060 @@
     }
 }
+#endif
 
 
@@ -3279 +3280 @@
 
 
+#ifdef IN_RING0
 /**
  * Exports the guest hardware-virtualization state.
@@ -3338 +3340 @@
     return VINF_SUCCESS;
 }
+#endif
 
 
@@ -3762 +3765 @@
 
 
+#ifdef IN_RING0
 /**
  * Exports the guest debug registers into the guest-state area in the VMCS.
@@ -3776 +3780 @@
 static int vmxHCExportSharedDebugState(PVMCPUCC pVCpu, PVMXTRANSIENT pVmxTransient)
 {
-#ifdef IN_RING0
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
-#endif
 
     /** @todo NSTVMX: Figure out what we want to do with nested-guest instruction
@@ -3816 +3818 @@
 #endif
 
-#ifdef IN_RING0 /** @todo */
     bool     fSteppingDB      = false;
     bool     fInterceptMovDRx = false;
@@ -3938 +3939 @@
         }
     }
+
+    return VINF_SUCCESS;
+}
 #endif /* !IN_RING0 */
-
-    return VINF_SUCCESS;
-}
 
 
@@ -4445 +4446 @@
 
 
+#ifdef IN_RING0
 /**
  * Exports certain guest MSRs into the VM-entry MSR-load and VM-exit MSR-store
@@ -4591 +4593 @@
         }
 
-#ifdef IN_RING0 /** @todo */
         /* Last Branch Record. */
         if (VM_IS_VMX_LBR(pVM))
@@ -4623 +4624 @@
             AssertRCReturn(rc, rc);
         }
-#endif /* !IN_RING0 */
 
         ASMAtomicUoAndU64(&VCPU_2_VMXSTATE(pVCpu).fCtxChanged, ~HM_CHANGED_GUEST_OTHER_MSRS);
@@ -4632 +4632 @@
 
 
-#ifdef IN_RING0
 /**
  * Sets up the usage of TSC-offsetting and updates the VMCS.
@@ -6796 +6795 @@
 
 
+#ifdef IN_RING0
 /**
  * Exports the guest state into the VMCS guest-state area.
@@ -6825 +6825 @@
     STAM_PROFILE_ADV_START(&VCPU_2_VMXSTATS(pVCpu).StatExportGuestState, x);
 
-#ifdef IN_RING0
     /*
      * Determine real-on-v86 mode.
@@ -6839 +6838 @@
         pVmcsInfoShared->RealMode.fRealOnV86Active = true;
     }
-#endif
 
     /*
@@ -6904 +6902 @@
 static void vmxHCExportSharedState(PVMCPUCC pVCpu, PVMXTRANSIENT pVmxTransient)
 {
-#ifdef IN_RING0
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
     Assert(!VMMRZCallRing3IsEnabled(pVCpu));
-#endif
 
     if (VCPU_2_VMXSTATE(pVCpu).fCtxChanged & HM_CHANGED_GUEST_DR_MASK)
@@ -6920 +6916 @@
     }
 
-#ifdef IN_RING0
     if (VCPU_2_VMXSTATE(pVCpu).fCtxChanged & HM_CHANGED_VMX_GUEST_LAZY_MSRS)
     {
@@ -6926 +6921 @@
         VCPU_2_VMXSTATE(pVCpu).fCtxChanged &= ~HM_CHANGED_VMX_GUEST_LAZY_MSRS;
     }
-#endif
 
     AssertMsg(!(VCPU_2_VMXSTATE(pVCpu).fCtxChanged & HM_CHANGED_VMX_HOST_GUEST_SHARED_STATE),
@@ -6949 +6943 @@
 {
     HMVMX_ASSERT_PREEMPT_SAFE(pVCpu);
-#ifdef IN_RING0
     Assert(!VMMRZCallRing3IsEnabled(pVCpu));
-#endif
 
 #ifdef HMVMX_ALWAYS_SYNC_FULL_GUEST_STATE
@@ -6986 +6978 @@
             AssertMsg(rcStrict == VINF_EM_RESCHEDULE_REM, ("Failed to export guest state! rc=%Rrc\n",
                                                            VBOXSTRICTRC_VAL(rcStrict)));
-#ifdef IN_RING0
             Assert(!VMMRZCallRing3IsEnabled(pVCpu));
-#endif
             return rcStrict;
         }
@@ -7004 +6994 @@
     return rcStrict;
 }
+#endif