Changeset 92560 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 23, 2021 10:07:54 AM (3 years ago)

Author:

vboxsync

Message:

VMM/NEMR3Native-darwin: Smaller fixes, bugref:9044

File:

• trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin.cpp

@@ -404 +404 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
+static void vmxHCImportGuestIntrState(PVMCPUCC pVCpu, PCVMXVMCSINFO pVmcsInfo);
 
 /**
@@ -823 +824 @@
     fWhat &= pVCpu->cpum.GstCtx.fExtrn;
 
+    if (fWhat & (CPUMCTX_EXTRN_INHIBIT_INT | CPUMCTX_EXTRN_INHIBIT_NMI))
+        vmxHCImportGuestIntrState(pVCpu, &pVCpu->nem.s.VmcsInfo);
+
     /* GPRs */
     hv_return_t hrc;
@@ -2150 +2154 @@
 static int nemR3DarwinVmxSetupVmcsProcCtls(PVMCPUCC pVCpu, PVMXVMCSINFO pVmcsInfo)
 {
-    PVMCC pVM = pVCpu->CTX_SUFF(pVM);
     uint32_t       fVal = g_HmMsrs.u.vmx.ProcCtls.n.allowed0;     /* Bits set here must be set in the VMCS. */
     uint32_t const fZap = g_HmMsrs.u.vmx.ProcCtls.n.allowed1;     /* Bits cleared here must be cleared in the VMCS. */
@@ -2521 +2524 @@
  * @param   pVM                 The VM handle.
  * @param   pVCpu               The vCPU handle.
- * @param   idCpu               ID of the CPU to create.
- */
-static DECLCALLBACK(int) nemR3DarwinNativeInitTprShadowing(PVM pVM, PVMCPU pVCpu, VMCPUID idCpu)
+ */
+static DECLCALLBACK(int) nemR3DarwinNativeInitTprShadowing(PVM pVM, PVMCPU pVCpu)
 {
     PVMXVMCSINFO pVmcsInfo = &pVCpu->nem.s.VmcsInfo;
@@ -2598 +2600 @@
             PVMCPU pVCpu = pVM->apCpusR3[idCpu];
 
-            int rc = VMR3ReqCallWait(pVM, idCpu, (PFNRT)nemR3DarwinNativeInitTprShadowing, 3, pVM, pVCpu, idCpu);
+            int rc = VMR3ReqCallWait(pVM, idCpu, (PFNRT)nemR3DarwinNativeInitTprShadowing, 2, pVM, pVCpu);
             if (RT_FAILURE(rc))
-                return VMSetError(pVM, VERR_NEM_VM_CREATE_FAILED, RT_SRC_POS, "Call to hv_vcpu_create failed: %Rrc", rc);
+                return VMSetError(pVM, VERR_NEM_VM_CREATE_FAILED, RT_SRC_POS, "Setting up TPR shadowing failed: %Rrc", rc);
         }
     }
@@ -2879 +2881 @@
     {
         /* Try anticipate what we might need. */
-        uint64_t fImport = IEM_CPUMCTX_EXTRN_MUST_MASK;
+        uint64_t fImport = NEM_DARWIN_CPUMCTX_EXTRN_MASK_FOR_IEM;
         if (   (rcStrict >= VINF_EM_FIRST && rcStrict <= VINF_EM_LAST)
             || RT_FAILURE(rcStrict))