Changeset 13879

Timestamp:

11/05/08 17:11:03 (2 months ago)

Author:

vboxsync

Message:

SMP updates for VT-x/AMD-V.

Files:

• trunk/include/VBox/hwaccm.h (modified) (1 diff)
• trunk/include/VBox/vm.h (modified) (1 diff)
• trunk/src/VBox/VMM/HWACCM.cpp (modified) (4 diffs)
• trunk/src/VBox/VMM/HWACCMInternal.h (modified) (9 diffs)
• trunk/src/VBox/VMM/VMMInternal.h (modified) (2 diffs)
• trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp (modified) (9 diffs)
• trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (17 diffs)
• trunk/src/VBox/VMM/VMMR0/HWSVMR0.h (modified) (5 diffs)
• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (35 diffs)
• trunk/src/VBox/VMM/VMMR0/HWVMXR0.h (modified) (5 diffs)
• trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (2 diffs)

trunk/include/VBox/hwaccm.h

@@ -124 +124 @@
- */
-VMMR0DECL(int)   HWACCMR0SetupVM(PVM pVM);
-uintptr_t id
-RTCPUID id
-RTCPUID id
-RTGCPTR GCVirt
+PVMCPU p
+PVMCPU p
+PVMCPU p
+PVMCPU pVCpu
-VMMR0DECL(int)   HWACCMR0FlushTLB(PVM pVM);
-VMMR0DECL(bool)  HWACCMR0SuspendPending();

trunk/include/VBox/vm.h

@@ -133 +133 @@
-        struct HWACCMCPU    s;
-#endif
-3
+51
-    } hwaccm;
-

trunk/src/VBox/VMM/HWACCM.cpp

@@ -106 +106 @@
-    /* On first entry we'll sync everything. */
-    pVM->hwaccm.s.fContextUseFlags = HWACCM_CHANGED_ALL;
-
-    pVM->hwaccm.s.vmx.cr0_mask = 0;
-    pVM->hwaccm.s.vmx.cr4_mask = 0;
-
-    /*
@@ -586 +583 @@
-            LogRel(("HWACCM: MSR_IA32_VMX_VMCS_ENUM        = %RX64\n", pVM->hwaccm.s.vmx.msr.vmx_vmcs_enum));
-
-            LogRel(("HWACCM: VMCS physaddr                 = %RHp\n", pVM->hwaccm.s.vmx.pVMCSPhys));
-            LogRel(("HWACCM: TPR shadow physaddr           = %RHp\n", pVM->hwaccm.s.vmx.pAPICPhys));
-            LogRel(("HWACCM: MSR bitmap physaddr           = %RHp\n", pVM->hwaccm.s.vmx.pMSRBitmapPhys));
+
+            for (unsigned i=0;i<pVM->cCPUs;i++)
+                LogRel(("HWACCM: VMCS physaddr VCPU%d           = %RHp\n", i, pVM->aCpus[i].hwaccm.s.vmx.pVMCSPhys));
-
-#ifdef HWACCM_VTX_WITH_EPT
@@ -878 +877 @@
-    pVM->hwaccm.s.fContextUseFlags = HWACCM_CHANGED_ALL;
-
-
-
+
+
+
+
+
-
-    pVM->hwaccm.s.Event.fPending = false;
@@ -1060 +1062 @@
-VMMR3DECL(void) HWACCMR3CheckError(PVM pVM, int iStatusCode)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -133 +133 @@
-#define HWACCM_SSM_VERSION                  3
-
-
+(host) 
-typedef struct
-{
@@ -229 +229 @@
-        bool                        fVPID;
-
-        /** R0 memory object for the VM control structure (VMCS). */
-        RTR0MEMOBJ                  pMemObjVMCS;
-        /** Physical address of the VM control structure (VMCS). */
-        RTHCPHYS                    pVMCSPhys;
-        /** Virtual address of the VM control structure (VMCS). */
-        R0PTRTYPE(void *)           pVMCS;
-
-        /** Virtual address of the TSS page used for real mode emulation. */
-        R3PTRTYPE(PVBOXTSS)         pRealModeTSS;
@@ -278 +271 @@
-
-        /** Ring 0 handlers for VT-x. */
-        DECLR0CALLBACKMEMBER(int,  pfnStartVM,(RTHCUINT fResume, PCPUMCTX pCtx));
-        DECLR0CALLBACKMEMBER(void, pfnSetupTaggedTLB, (PVM pVM));
-
@@ -287 +279 @@
-        /** Host CR4 value (set by ring-0 VMX init) */
-        uint64_t                    hostCR4;
-
-        /** Current VMX_VMCS_CTRL_PROC_EXEC_CONTROLS. */
-        uint64_t                    proc_ctls;
-
-        /** Current CR0 mask. */
-        uint64_t                    cr0_mask;
-        /** Current CR4 mask. */
-        uint64_t                    cr4_mask;
-
-        /** Current EPTP. */
-        RTHCPHYS                    GCPhysEPTP;
-
-        /** VMX MSR values */
@@ -356 +337 @@
-        bool                        fAlwaysFlushTLB;
-
-        /** R0 memory object for the VM control block (VMCB). */
-        RTR0MEMOBJ                  pMemObjVMCB;
-        /** Physical address of the VM control block (VMCB). */
-        RTHCPHYS                    pVMCBPhys;
-        /** Virtual address of the VM control block (VMCB). */
-        R0PTRTYPE(void *)           pVMCB;
-
-        /** R0 memory object for the host VM control block (VMCB). */
-        RTR0MEMOBJ                  pMemObjVMCBHost;
@@ -383 +357 @@
-        /** Virtual address of the MSR bitmap. */
-        R0PTRTYPE(void *)           pMSRBitmap;
-
-        /** Ring 0 handlers for VT-x. */
-        DECLR0CALLBACKMEMBER(int, pfnVMRun,(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx));
-
-        /** SVM revision. */
@@ -501 +472 @@
-     * See HWACCMCPU2VM(). */
-    RTUINT                      offVMCPU;
+
+    struct
+    {
+        /** R0 memory object for the VM control structure (VMCS). */
+        RTR0MEMOBJ                  pMemObjVMCS;
+        /** Physical address of the VM control structure (VMCS). */
+        RTHCPHYS                    pVMCSPhys;
+        /** Virtual address of the VM control structure (VMCS). */
+        R0PTRTYPE(void *)           pVMCS;
+
+        /** Ring 0 handlers for VT-x. */
+        DECLR0CALLBACKMEMBER(int,  pfnStartVM,(RTHCUINT fResume, PCPUMCTX pCtx));
+
+        /** Current VMX_VMCS_CTRL_PROC_EXEC_CONTROLS. */
+        uint64_t                    proc_ctls;
+
+        /** Current CR0 mask. */
+        uint64_t                    cr0_mask;
+        /** Current CR4 mask. */
+        uint64_t                    cr4_mask;
+
+        /** Current EPTP. */
+        RTHCPHYS                    GCPhysEPTP;
+    } vmx;
+
+    struct
+    {
+        /** R0 memory object for the VM control block (VMCB). */
+        RTR0MEMOBJ                  pMemObjVMCB;
+        /** Physical address of the VM control block (VMCB). */
+        RTHCPHYS                    pVMCBPhys;
+        /** Virtual address of the VM control block (VMCB). */
+        R0PTRTYPE(void *)           pVMCB;
+
+        /** Ring 0 handlers for VT-x. */
+        DECLR0CALLBACKMEMBER(int, pfnVMRun,(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx));
+
+    } svm;
+
-} HWACCMCPU;
-/** Pointer to HWACCM VM instance data. */
@@ -519 +529 @@
-
-/* Dummy callback handlers. */
-RTCPUID id
-RTCPUID id
+PVMCPU p
+PVMCPU p
-VMMR0DECL(int) HWACCMR0DummyEnableCpu(PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys);
-VMMR0DECL(int) HWACCMR0DummyDisableCpu(PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys);
@@ -526 +536 @@
-VMMR0DECL(int) HWACCMR0DummyTermVM(PVM pVM);
-VMMR0DECL(int) HWACCMR0DummySetupVM(PVM pVM);
-RTCPUID id
-RTCPUID id
-RTCPUID id
+PVMCPU p
+PVMCPU p
+PVMCPU p
-
-#endif /* IN_RING0 */

trunk/src/VBox/VMM/VMMInternal.h

@@ -450 +450 @@
- * @param   pVM     The VM handle.
- */
-uintptr_t id
+PVMCPU pV
-/** Pointer to FNVMMR0SETJMP(). */
-typedef FNVMMR0SETJMP *PFNVMMR0SETJMP;
@@ -466 +466 @@
- * @param   pVM         The argument of that function.
- */
-uintptr_t id
+PVMCPU pV
-
-/**

trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp

@@ -65 +65 @@
-
-    /** Ring 0 handlers for VT-x and AMD-V. */
-RTCPUID id
-RTCPUID id
-RTCPUID id
-RTCPUID id
-RTCPUID id
+PVMCPU p
+PVMCPU p
+PVMCPU p
+PVMCPU p
+PVMCPU p
-    DECLR0CALLBACKMEMBER(int, pfnEnableCpu, (PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys));
-    DECLR0CALLBACKMEMBER(int, pfnDisableCpu, (PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys));
@@ -865 +865 @@
- * @returns VBox status code.
- * @param   pVM         The VM to operate on.
-id
-
-RTCPUID id
+p
+
+PVMCPU p
-{
-    PCPUMCTX        pCtx;
@@ -895 +895 @@
-        pVM->hwaccm.s.u64RegisterMask = UINT64_C(0xFFFFFFFF);
-
-id
+p
-    AssertRC(rc);
-    /* We must save the host context here (VT-x) as we might be rescheduled on a different cpu after a long jump back to ring 3. */
-id
+p
-    AssertRC(rc);
-id
+p
-    AssertRC(rc);
-
@@ -920 +920 @@
- * @returns VBox status code.
- * @param   pVM         The VM to operate on.
-id
-
-RTCPUID id
+p
+
+PVMCPU p
-{
-    PCPUMCTX        pCtx;
@@ -946 +946 @@
-    }
-
-id
+p
-
-#ifdef VBOX_STRICT
@@ -963 +963 @@
- * @returns VBox status code.
- * @param   pVM         The VM to operate on.
-id
-
-uintptr_t id
+p
+
+PVMCPU p
-{
-    CPUMCTX *pCtx;
-    int      rc;
-    RTCPUID  idCpu = RTMpCpuId(); NOREF(idCpu);
-#ifdef VBOX_STRICT
@@ -981 +980 @@
-    pCtx = CPUMQueryGuestCtxPtr(pVM);
-
-id
+p
-}
-
@@ -1280 +1279 @@
-
-/* Dummy callback handlers. */
-RTCPUID id
+PVMCPU p
-{
-    return VINF_SUCCESS;
-}
-
-RTCPUID id
+PVMCPU p
-{
-    return VINF_SUCCESS;
@@ -1315 +1314 @@
-}
-
-RTCPUID id
+PVMCPU p
-{
-    return VINF_SUCCESS;
-}
-
-RTCPUID id
+PVMCPU p
-{
-    return VINF_SUCCESS;
-}
-
-RTCPUID id
+PVMCPU p
-{
-    return VINF_SUCCESS;

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -125 +125 @@
-    int rc;
-
-    pVM->hwaccm.s.svm.pMemObjVMCB = NIL_RTR0MEMOBJ;
-    pVM->hwaccm.s.svm.pMemObjVMCBHost = NIL_RTR0MEMOBJ;
-    pVM->hwaccm.s.svm.pMemObjIOBitmap = NIL_RTR0MEMOBJ;
-    pVM->hwaccm.s.svm.pMemObjMSRBitmap = NIL_RTR0MEMOBJ;
-
-
-    /* Allocate one page for the VM control block (VMCB). */
-    rc = RTR0MemObjAllocCont(&pVM->hwaccm.s.svm.pMemObjVMCB, 1 << PAGE_SHIFT, true /* executable R0 mapping */);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    pVM->hwaccm.s.svm.pVMCB     = RTR0MemObjAddress(pVM->hwaccm.s.svm.pMemObjVMCB);
-    pVM->hwaccm.s.svm.pVMCBPhys = RTR0MemObjGetPagePhysAddr(pVM->hwaccm.s.svm.pMemObjVMCB, 0);
-    ASMMemZeroPage(pVM->hwaccm.s.svm.pVMCB);
-
-    /* Allocate one page for the host context */
@@ -199 +188 @@
-        pVM->hwaccm.s.svm.fAlwaysFlushTLB = true;
-    }
+
+    /* Allocate VMCBs for all guest CPUs. */
+    for (unsigned i=0;i<pVM->cCPUs;i++)
+    {
+        pVM->aCpus[i].hwaccm.s.svm.pMemObjVMCB = NIL_RTR0MEMOBJ;
+
+        /* Allocate one page for the VM control block (VMCB). */
+        rc = RTR0MemObjAllocCont(&pVM->aCpus[i].hwaccm.s.svm.pMemObjVMCB, 1 << PAGE_SHIFT, true /* executable R0 mapping */);
+        if (RT_FAILURE(rc))
+            return rc;
+
+        pVM->aCpus[i].hwaccm.s.svm.pVMCB     = RTR0MemObjAddress(pVM->aCpus[i].hwaccm.s.svm.pMemObjVMCB);
+        pVM->aCpus[i].hwaccm.s.svm.pVMCBPhys = RTR0MemObjGetPagePhysAddr(pVM->aCpus[i].hwaccm.s.svm.pMemObjVMCB, 0);
+        ASMMemZeroPage(pVM->aCpus[i].hwaccm.s.svm.pVMCB);
+    }
+
-    return VINF_SUCCESS;
-}
@@ -210 +215 @@
-VMMR0DECL(int) SVMR0TermVM(PVM pVM)
-{
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-    if (pVM->hwaccm.s.svm.pMemObjVMCBHost != NIL_RTR0MEMOBJ)
@@ -256 +264 @@
-    Assert(pVM->hwaccm.s.svm.fSupported);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#ifndef DEBUG
-
-
+    
+    
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return rc;
-}
@@ -514 +525 @@
- * @returns VBox status code.
- * @param   pVM         The VM to operate on.
-idVCpu      VPCPU id
+pVMCPU      The VM CPU to operate on
- */
-RTCPUID id
+PVMCPU p
-{
-    NOREF(pVM);
-id
+p
-    /* Nothing to do here. */
-    return VINF_SUCCESS;
@@ -531 +542 @@
- * @returns VBox status code.
- * @param   pVM         The VM to operate on.
-idVCpu      VPCPU id
+pVMCPU      The VM CPU to operate on
- * @param   pCtx        Guest context
- */
-RTCPUID id
+PVMCPU p
-{
-    RTGCUINTPTR val;
@@ -545 +556 @@
-    Assert(pVM->hwaccm.s.svm.fSupported);
-
-M
+Cpu
-    AssertMsgReturn(pVMCB, ("Invalid pVMCB\n"), VERR_EM_INTERNAL_ERROR);
-
@@ -736 +747 @@
-        return VERR_PGM_UNSUPPORTED_SHADOW_PAGING_MODE;
-#else
-M
+Cpu
-#endif
-        /* Unconditionally update these as wrmsr might have changed them. (HWACCM_CHANGED_GUEST_SEGMENT_REGS will not be set) */
@@ -747 +758 @@
-        pVMCB->guest.u64EFER &= ~MSR_K6_EFER_LME;
-
-M
+Cpu
-    }
-
@@ -789 +800 @@
- * @returns VBox status code.
- * @param   pVM         The VM to operate on.
-idVCpu      VPCPU id
+pVMCPU      The VM CPU to operate on
- * @param   pCtx        Guest context
- */
-RTCPUID id
+PVMCPU p
-{
-    int         rc = VINF_SUCCESS;
@@ -807 +818 @@
-    STAM_PROFILE_ADV_START(&pVM->hwaccm.s.StatEntry, x);
-
-M
+Cpu
-    AssertMsgReturn(pVMCB, ("Invalid pVMCB\n"), VERR_EM_INTERNAL_ERROR);
-
@@ -934 +945 @@
-
-    /* Load the guest state; *must* be here as it sets up the shadow cr0 for lazy fpu syncing! */
-id
+p
-    if (rc != VINF_SUCCESS)
-    {
@@ -1001 +1012 @@
-    pVM->hwaccm.s.fForceTLBFlush = pVM->hwaccm.s.svm.fAlwaysFlushTLB;
-
-M
+Cpu
-    Assert(pVMCB->ctrl.u32InterceptCtrl2 == ( SVM_CTRL2_INTERCEPT_VMRUN         /* required */
-                                             | SVM_CTRL2_INTERCEPT_VMMCALL
@@ -1022 +1033 @@
-#endif
-    TMNotifyStartOfExecution(pVM);
-M->hwaccm.s.svm.pfnVMRun(pVM->hwaccm.s.svm.pVMCBHostPhys, pVM
+Cpu->hwaccm.s.svm.pfnVMRun(pVM->hwaccm.s.svm.pVMCBHostPhys, pVCpu
-    TMNotifyEndOfExecution(pVM);
-    STAM_PROFILE_ADV_STOP(&pVM->hwaccm.s.StatInGC, x);
@@ -2048 +2059 @@
- * @returns VBox status code.
- * @param   pVM         The VM to operate on.
-idVCpu      VPCPU id
+pVCpu       The VM CPU to operate on
- * @param   pCpu        CPU info struct
- */
-RTCPUID id
+PVMCPU p
-{
-    Assert(pVM->hwaccm.s.svm.fSupported);
@@ -2070 +2081 @@
- * @returns VBox status code.
- * @param   pVM         The VM to operate on.
-idVCpu      VPCPU id
+pVCpu       The VM CPU to operate on
- * @param   pCtx        CPU context
- */
-RTCPUID id
+PVMCPU p
-{
-M
+Cpu
-
-    Assert(pVM->hwaccm.s.svm.fSupported);
@@ -2203 +2214 @@
-        Assert(pVM->hwaccm.s.svm.fSupported);
-
-
+
+
-        AssertMsgReturn(pVMCB, ("Invalid pVMCB\n"), VERR_EM_INTERNAL_ERROR);
-

trunk/src/VBox/VMM/VMMR0/HWSVMR0.h

@@ -47 +47 @@
- * @returns VBox status code.
- * @param   pVM         The VM to operate on.
-id
+p
- * @param   pCpu        CPU info struct
- */
-RTCPUID id
+PVMCPU p
-
-/**
@@ -57 +57 @@
- * @returns VBox status code.
- * @param   pVM         The VM to operate on.
-id
+p
- * @param   pCtx        CPU context
- */
-RTCPUID id
+PVMCPU p
-
-/**
@@ -113 +113 @@
- * @returns VBox status code.
- * @param   pVM         The VM to operate on.
-id
+p
- * @param   pCtx        Guest context
- */
-RTCPUID id
+PVMCPU p
-
-
@@ -124 +124 @@
- * @returns VBox status code.
- * @param   pVM         The VM to operate on.
-id
+p
- */
-RTCPUID id
+PVMCPU p
-
-/**
@@ -133 +133 @@
- * @returns VBox status code.
- * @param   pVM         The VM to operate on.
-id
+p
- * @param   pCtx        Guest context
- */
-RTCPUID id
+PVMCPU p
-
-

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -152 +152 @@
-    SUPR0Printf("VMXR0InitVM %x\n", pVM);
-#endif
-
+
-    pVM->hwaccm.s.vmx.pMemObjAPIC = NIL_RTR0MEMOBJ;
-
-
-    /* Allocate one page for the VM control structure (VMCS). */
-    rc = RTR0MemObjAllocCont(&pVM->hwaccm.s.vmx.pMemObjVMCS, 1 << PAGE_SHIFT, true /* executable R0 mapping */);
-    AssertRC(rc);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    pVM->hwaccm.s.vmx.pVMCS     = RTR0MemObjAddress(pVM->hwaccm.s.vmx.pMemObjVMCS);
-    pVM->hwaccm.s.vmx.pVMCSPhys = RTR0MemObjGetPagePhysAddr(pVM->hwaccm.s.vmx.pMemObjVMCS, 0);
-    ASMMemZero32(pVM->hwaccm.s.vmx.pVMCS, PAGE_SIZE);
-
-    if (pVM->hwaccm.s.vmx.msr.vmx_proc_ctls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_USE_TPR_SHADOW)
@@ -198 +187 @@
-    }
-
+    /* Allocate VMCBs for all guest CPUs. */
+    for (unsigned i=0;i<pVM->cCPUs;i++)
+    {
+        pVM->aCpus[i].hwaccm.s.vmx.pMemObjVMCS = NIL_RTR0MEMOBJ;
+
+        /* Allocate one page for the VM control structure (VMCS). */
+        rc = RTR0MemObjAllocCont(&pVM->aCpus[i].hwaccm.s.vmx.pMemObjVMCS, 1 << PAGE_SHIFT, true /* executable R0 mapping */);
+        AssertRC(rc);
+        if (RT_FAILURE(rc))
+            return rc;
+
+        pVM->aCpus[i].hwaccm.s.vmx.pVMCS     = RTR0MemObjAddress(pVM->aCpus[i].hwaccm.s.vmx.pMemObjVMCS);
+        pVM->aCpus[i].hwaccm.s.vmx.pVMCSPhys = RTR0MemObjGetPagePhysAddr(pVM->aCpus[i].hwaccm.s.vmx.pMemObjVMCS, 0);
+        ASMMemZero32(pVM->aCpus[i].hwaccm.s.vmx.pVMCS, PAGE_SIZE);
+
+        pVM->aCpus[i].hwaccm.s.vmx.cr0_mask = 0;
+        pVM->aCpus[i].hwaccm.s.vmx.cr4_mask = 0;
+
+#ifdef LOG_ENABLED
+        SUPR0Printf("VMXR0InitVM %x VMCS=%x (%x)\n", pVM, pVM->aCpus[i].hwaccm.s.vmx.pVMCS, (uint32_t)pVM->aCpus[i].hwaccm.s.vmx.pVMCSPhys);
+#endif
+    }
+
-    /* Current guest paging mode. */
-    pVM->hwaccm.s.vmx.enmCurrGuestMode = PGMMODE_REAL;
-
-#ifdef LOG_ENABLED
-    SUPR0Printf("VMXR0InitVM %x VMCS=%x (%x)\n", pVM, pVM->hwaccm.s.vmx.pVMCS, (uint32_t)pVM->hwaccm.s.vmx.pVMCSPhys);
-#endif
-    return VINF_SUCCESS;
-}
@@ -215 +224 @@
-VMMR0DECL(int) VMXR0TermVM(PVM pVM)
-{
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-    if (pVM->hwaccm.s.vmx.pMemObjAPIC != NIL_RTR0MEMOBJ)
@@ -251 +263 @@
-
-    AssertReturn(pVM, VERR_INVALID_PARAMETER);
-
-
-
-
-