Changeset 72772 in vbox for trunk

Timestamp:

Jun 29, 2018 11:28:28 AM (7 years ago)

Author:

vboxsync

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

123313

Message:

VMM/HMSVMR0: 32-bit build fix. Grr...

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMR0.cpp (modified) (1 diff)
• HMSVMR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/HMR0.cpp

@@ -1618 +1618 @@
     RT_NOREF(pCtx);
     STAM_COUNTER_INC(&pVCpu->hm.s.StatDebug64SwitchBack);
-    if (pVCpu->CTX_SUFF(pVM)->hm.s.vmx.fSupported)
+    if (pVM->hm.s.vmx.fSupported)
         return VMXR0Execute64BitsHandler(pVCpu, HM64ON32OP_HMRCSaveGuestDebug64, 0, NULL);
     return SVMR0Execute64BitsHandler(pVCpu, HM64ON32OP_HMRCSaveGuestDebug64, 0, NULL);

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -1365 +1365 @@
 DECLASM(int) SVMR0VMSwitcherRun64(RTHCPHYS HCPhysVmcbHost, RTHCPHYS HCPhysVmcb, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu)
 {
-    RT_NOREF(pVM);
+    RT_NOREF2(pVM, pCtx);
     uint32_t aParam[8];
     aParam[0] = RT_LO_U32(HCPhysVmcbHost);              /* Param 1: HCPhysVmcbHost - Lo. */
@@ -1457 +1457 @@
     {
         bool fRemove = true;
-#ifdef VBOX_WITH_NESTED_HWVIRT_SVM
+# ifdef VBOX_WITH_NESTED_HWVIRT_SVM
         /* Only remove the intercept if the nested-guest is also not intercepting it! */
         PCCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
@@ -1465 +1465 @@
             fRemove = !(pVmcbNstGstCache->u32InterceptXcpt & RT_BIT(uXcpt));
         }
-#endif
+# else
+        RT_NOREF(pVCpu);
+# endif
         if (fRemove)
         {