Index: /trunk/src/VBox/VMM/VMMAll/IEMAll.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/IEMAll.cpp	(revision 66581)
+++ /trunk/src/VBox/VMM/VMMAll/IEMAll.cpp	(revision 66582)
@@ -470,5 +470,5 @@
 # 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,5 +881,5 @@
 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,5 +930,5 @@
     return VERR_IEM_IPE_9;
 }
-#endif /* VBOX_WITH_NESTED_HWVIRT && !IN_RC */
+#endif /* VBOX_WITH_NESTED_HWVIRT */
 
 
@@ -5249,5 +5249,5 @@
 #endif
 
-#if defined(VBOX_WITH_NESTED_HWVIRT) && !defined(IN_RC)
+#ifdef VBOX_WITH_NESTED_HWVIRT
     if (IEM_IS_SVM_ENABLED(pVCpu))
     {
@@ -5308,5 +5308,5 @@
         }
     }
-#endif
+#endif /* VBOX_WITH_NESTED_HWVIRT */
 
     /*
@@ -12055,5 +12055,5 @@
     } 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,5 +12079,5 @@
     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 */
 
 
Index: /trunk/src/VBox/VMM/VMMAll/IEMAllInstructionsTwoByte0f.cpp.h
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/IEMAllInstructionsTwoByte0f.cpp.h	(revision 66581)
+++ /trunk/src/VBox/VMM/VMMAll/IEMAllInstructionsTwoByte0f.cpp.h	(revision 66582)
@@ -890,4 +890,6 @@
     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