Changeset 66582 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Apr 17, 2017 3:12:35 AM (8 years ago)

Author:

vboxsync

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

114609

Message:

VMM: Nested Hw.virt: Clean up defines and build fix.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (7 diffs)
• IEMAllInstructionsTwoByte0f.cpp.h (modified) (1 diff)

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

@@ -470 +470 @@
 # define IEM_SVM_NST_GST_MSR_INTERCEPT(a_pVCpu, a_idMsr, a_fWrite)                        (VERR_SVM_IPE_1)
 
-#endif /* VBOX_WITH_NESTED_HWVIRT && !IN_RC */
+#endif /* VBOX_WITH_NESTED_HWVIRT */
 
 
@@ -881 +881 @@
 IEM_STATIC VBOXSTRICTRC     iemVerifyFakeIOPortWrite(PVMCPU pVCpu, RTIOPORT Port, uint32_t u32Value, size_t cbValue);
 
-#if defined(VBOX_WITH_NESTED_HWVIRT) && !defined(IN_RC)
+#ifdef VBOX_WITH_NESTED_HWVIRT
 /**
  * Checks if the intercepted IO instruction causes a \#VMEXIT and handles it
@@ -930 +930 @@
     return VERR_IEM_IPE_9;
 }
-#endif /* VBOX_WITH_NESTED_HWVIRT && !IN_RC */
+#endif /* VBOX_WITH_NESTED_HWVIRT */
 
 
@@ -5249 +5249 @@
 #endif
 
-#if defined(VBOX_WITH_NESTED_HWVIRT) && !defined(IN_RC)
+#ifdef VBOX_WITH_NESTED_HWVIRT
     if (IEM_IS_SVM_ENABLED(pVCpu))
     {
@@ -5308 +5308 @@
         }
     }
-#endif
+#endif /* VBOX_WITH_NESTED_HWVIRT */
 
     /*
@@ -12055 +12055 @@
     } while (0)
 
-#if defined(VBOX_WITH_NESTED_HWVIRT) && !defined(IN_RC)
+#ifdef VBOX_WITH_NESTED_HWVIRT
 /** Check and handles SVM nested-guest control & instruction intercept. */
 # define IEMOP_HLP_SVM_CTRL_INTERCEPT(a_pVCpu, a_Intercept, a_uExitCode, a_uExitInfo1, a_uExitInfo2) \
@@ -12079 +12079 @@
     do { RT_NOREF4(a_pVCpu, a_uCr, a_uExitInfo1, a_uExitInfo2); } while (0)
 
-#endif /* VBOX_WITH_NESTED_HWVIRT && !IN_RC */
+#endif /* VBOX_WITH_NESTED_HWVIRT */
 
 

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

@@ -890 +890 @@
     IEM_MC_RAISE_GP0_IF_CPL_NOT_ZERO();
     IEMOP_HLP_SVM_CTRL_INTERCEPT(pVCpu, SVM_CTRL_INTERCEPT_INVD, SVM_EXIT_INVD, 0, 0);
+#else
+    RT_NOREF_PV(pVCpu);
 #endif
     /** @todo implement invd for the regular case (above only handles nested SVM