Changeset 76468 in vbox for trunk/include/VBox

Timestamp:

Dec 25, 2018 5:00:01 AM (6 years ago)

Author:

vboxsync

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

127769

Message:

SUPDrv, VMM: Build fix because on damn Linux we get naming conflicts with system headers if we include hm_vmx.h. Grrr.... Find a better solution if possible later. For now just don't include hm_vmx.h in sup.h.

File:

• trunk/include/VBox/sup.h (modified) (2 diffs)

trunk/include/VBox/sup.h

@@ -29 +29 @@
 #include <VBox/cdefs.h>
 #include <VBox/types.h>
-#include <VBox/vmm/hm_vmx.h>
-#include <VBox/vmm/hm_svm.h>
 #include <iprt/assert.h>
 #include <iprt/stdarg.h>
@@ -117 +115 @@
     union
     {
-        VMXMSRS     vmx;
-        SVMMSRS     svm;
-    } u ;
+        struct
+        {
+            uint64_t        u64FeatCtrl;
+            uint64_t        u64Basic;
+            uint64_t        u64PinCtls;
+            uint64_t        u64ProcCtls;
+            uint64_t        u64ProcCtls2;
+            uint64_t        u64ExitCtls;
+            uint64_t        u64EntryCtls;
+            uint64_t        u64TruePinCtls;
+            uint64_t        u64TrueProcCtls;
+            uint64_t        u64TrueEntryCtls;
+            uint64_t        u64TrueExitCtls;
+            uint64_t        u64Misc;
+            uint64_t        u64Cr0Fixed0;
+            uint64_t        u64Cr0Fixed1;
+            uint64_t        u64Cr4Fixed0;
+            uint64_t        u64Cr4Fixed1;
+            uint64_t        u64VmcsEnum;
+            uint64_t        u64VmFunc;
+            uint64_t        u64EptVpidCaps;
+            uint64_t        a_u64Reserved[9];
+        } vmx;
+        struct
+        {
+            uint64_t        u64MsrHwcr;
+            uint64_t        u64Padding[27];
+        }svm;
+    } u;
 } SUPHWVIRTMSRS;
 AssertCompileSize(SUPHWVIRTMSRS, 224);