Changeset 105687 in vbox for trunk/src/VBox/VMM/VMMAll/GICAll.cpp

Timestamp:

Aug 15, 2024 12:45:46 PM (4 months ago)

Author:

vboxsync

Message:

VMMArm/GIC: Rename GICR3Kvm to GICR3Nem and add a stub for macOS Hypervisor.framework which will be handled by the NEM backend directly due to the hv_gic_* API being entangled with the rest of the hv_* API, bugref:10747

File:

• trunk/src/VBox/VMM/VMMAll/GICAll.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/GICAll.cpp

@@ -1215 +1215 @@
     /** @todo r=aeichner There must be another way to do this better, maybe create some callback interface
      *                   the GIC can register. */
-#ifdef RT_OS_LINUX
-# ifdef IN_RING3
-    if (pGic->fKvmGic)
-        return GICR3KvmSpiSet(pVM, uIntId, fAsserted);
-# else
-#  error "Impossible to call the KVM in-kernel GIC from this context!"
-# endif
+#ifdef IN_RING3
+    if (pGic->fNemGic)
+        return GICR3NemSpiSet(pVM, uIntId, fAsserted);
+#else
+# error "Impossible to call the NEM in-kernel GIC from this context!"
 #endif
 
@@ -1259 +1257 @@
     /** @todo r=aeichner There must be another way to do this better, maybe create some callback interface
      *                   the GIC can register. */
-#ifdef RT_OS_LINUX
-# ifdef IN_RING3
+#ifdef IN_RING3
     PGIC pGic = VM_TO_GIC(pVCpu->pVMR3);
-    if (pGic->fKvmGic)
-        return GICR3KvmPpiSet(pVCpu, uIntId, fAsserted);
-# else
-#  error "Impossible to call the KVM in-kernel GIC from this context!"
-# endif
+    if (pGic->fNemGic)
+        return GICR3NemPpiSet(pVCpu, uIntId, fAsserted);
+#else
+# error "Impossible to call the NEM in-kernel GIC from this context!"
 #endif