Changeset 66001 in vbox

Timestamp:

Mar 8, 2017 8:35:16 PM (8 years ago)

Author:

vboxsync

Message:

VMM: Nested Hw.virt: Temporary build fix to work around recompiler duplicate defs. Need to fix it properly...

Location:

trunk

Files:

• include/VBox/vmm/cpum.h (modified) (2 diffs)
• src/VBox/VMM/VMMAll/HMSVMAll.cpp (modified) (1 diff)

trunk/include/VBox/vmm/cpum.h

@@ -32 +32 @@
 #include <VBox/vmm/stam.h>
 #include <VBox/vmm/vmapi.h>
-#include <VBox/vmm/hm_svm.h>
 
 RT_C_DECLS_BEGIN
@@ -1361 +1360 @@
      * See AMD spec., 15.5 "VMRUN instruction" subsection "Canonicalization and Consistency Checks".
      */
-    return RT_BOOL(pCtx->hwvirt.svm.u64InterceptCtrl & SVM_CTRL_INTERCEPT_VMRUN);
+    /** @todo Fix this -- silly recompiler is redefining this stuff... why? */
+    return RT_BOOL(pCtx->hwvirt.svm.u64InterceptCtrl & RT_BIT_64(32) /* SVM_CTRL_INTERCEPT_VMRUN*/);
     /** @todo Intel VMX.  */
 }

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

@@ -26 +26 @@
 #include <VBox/vmm/hm.h>
 #include <VBox/vmm/vm.h>
+#include <VBox/vmm/hm_svm.h>