Changeset 66022 in vbox

Timestamp:

Mar 9, 2017 4:30:11 PM (8 years ago)

Author:

vboxsync

Message:

VMM: Nested Hw.virt: Backed out r113878. Attempted build fix for linux kernel modules, avoid prototypes in hm_svm.h and hm_vmx.h (treat like x86.h).

Location:

trunk

Files:

• include/VBox/vmm/hm.h (modified) (2 diffs)
• include/VBox/vmm/hm_svm.h (modified) (2 diffs)
• src/VBox/HostDrivers/Support/linux/files_vboxdrv (modified) (1 diff)

trunk/include/VBox/vmm/hm.h

@@ -30 +30 @@
 #include <VBox/vmm/cpum.h>
 #include <VBox/vmm/vmm.h>
+#include <VBox/vmm/hm_svm.h>
 #include <iprt/mp.h>
 
@@ -151 +152 @@
                                                   uint64_t uExitInfo2);
 VMM_INT_DECL(void)              HMVmxNstGstVmExit(PVMCPU pVCpu, uint16_t uBasicExitReason);
+VMM_INT_DECL(VBOXSTRICTRC)      HMSvmVmmcall(PVMCPU pVCpu, PCPUMCTX pCtx, bool *pfRipUpdated);
+VMM_INT_DECL(VBOXSTRICTRC)      HMSvmVmrun(PVMCPU pVCpu, PCPUMCTX pCtx, PSVMVMCB pVmcb, PSVMHOSTSTATE pHostState);
 
 #ifndef IN_RC

trunk/include/VBox/vmm/hm_svm.h

@@ -29 +29 @@
 #include <VBox/types.h>
 #include <VBox/err.h>
-#include <VBox/vmm/cpumctx.h>
 #include <iprt/assert.h>
 #include <iprt/asm.h>
@@ -970 +969 @@
 
 
-VMM_INT_DECL(VBOXSTRICTRC)      HMSvmVmmcall(PVMCPU pVCpu, PCPUMCTX pCtx, bool *pfRipUpdated);
-VMM_INT_DECL(VBOXSTRICTRC)      HMSvmVmrun(PVMCPU pVCpu, PCPUMCTX pCtx, PSVMVMCB pVmcb, PSVMHOSTSTATE pHostState);
-
 /** @} */
 

trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv

@@ -79 +79 @@
     ${PATH_ROOT}/include/VBox/SUPDrvMangling.h=>include/VBox/SUPDrvMangling.h \
     ${PATH_ROOT}/include/VBox/VBoxTpG.h=>include/VBox/VBoxTpG.h \
-    ${PATH_ROOT}/include/VBox/vmm/cpumctx.h=>include/VBox/vmm/cpumctx.h \
     ${PATH_ROOT}/include/VBox/vmm/hm_vmx.h=>include/VBox/vmm/hm_vmx.h \
     ${PATH_ROOT}/include/VBox/vmm/hm_svm.h=>include/VBox/vmm/hm_svm.h \