Changeset 66581 in vbox for trunk/src/VBox/Main/src-server/HostImpl.cpp

Timestamp:

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

Author:

vboxsync

Message:

VMM: Nested Hw.virt: Implemented various SVM intercepts in IEM, addressed some todos.

File:

• trunk/src/VBox/Main/src-server/HostImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -156 +156 @@
 #endif
 
-/* XXX Solaris: definitions in /usr/include/sys/regset.h clash with hm_svm.h */
-#undef DS
-#undef ES
-#undef CS
-#undef SS
-#undef FS
-#undef GS
-
 #include <VBox/usb.h>
-#include <VBox/vmm/hm_svm.h>
 #include <VBox/err.h>
 #include <VBox/settings.h>
@@ -365 +356 @@
                         uint32_t fSVMFeaturesEdx;
                         ASMCpuId(0x8000000a, &uDummy, &uDummy, &uDummy, &fSVMFeaturesEdx);
-                        if (fSVMFeaturesEdx & AMD_CPUID_SVM_FEATURE_EDX_NESTED_PAGING)
+                        if (fSVMFeaturesEdx & X86_CPUID_SVM_FEATURE_EDX_NESTED_PAGING)
                             m->fNestedPagingSupported = true;
                     }