Changeset 92456 in vbox

Timestamp:

Nov 16, 2021 11:10:46 AM (3 years ago)

Author:

vboxsync

Message:

VMM/NEMR3Native-darwin.cpp: Sigh Apple^{2, bugref:9044}

File:

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

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

@@ -2433 +2433 @@
 static DECLCALLBACK(int) nemR3DarwinNativeTermVCpuOnEmt(PVMCPU pVCpu)
 {
-    hv_return_t hrc = hv_vcpu_destroy(pVCpu->nem.s.hVCpuId);
+    hv_return_t hrc = hv_vcpu_set_space(pVCpu->nem.s.hVCpuId, 0 /*asid*/);
+    Assert(hrc == HV_SUCCESS);
+
+    hrc = hv_vcpu_destroy(pVCpu->nem.s.hVCpuId);
     Assert(hrc == HV_SUCCESS); RT_NOREF(hrc);
     return VINF_SUCCESS;
@@ -2492 +2495 @@
     {
         PVMCPU pVCpu = pVM->apCpusR3[idCpu];
+
+        /*
+         * Need to do this or hv_vm_space_destroy() fails later on (on 10.15 at least). Could've been documented in
+         * API reference so I wouldn't have to decompile the kext to find this out but we are talking
+         * about Apple here unfortunately, API documentation is not their strong suit...
+         * Would have been of course even better to just automatically drop the address space reference when the vCPU
+         * gets destroyed.
+         */
+        hv_return_t hrc = hv_vcpu_set_space(pVCpu->nem.s.hVCpuId, 0 /*asid*/);
+        Assert(hrc == HV_SUCCESS);
 
         /*
@@ -2501 +2514 @@
          * from EMT(0) as well.
          */
-        hv_return_t hrc = hv_vcpu_destroy(pVCpu->nem.s.hVCpuId);
+        hrc = hv_vcpu_destroy(pVCpu->nem.s.hVCpuId);
         Assert(hrc == HV_SUCCESS); RT_NOREF(hrc);