Changeset 105697 in vbox for trunk

Timestamp:

Aug 15, 2024 6:28:56 PM (5 months ago)

Author:

vboxsync

Message:

Main,VMMArm/GIC: Fixes for linux.arm64, bugref:10747

Location:

trunk/src/VBox

Files:

• Main/src-client/ConsoleImplConfigArmV8.cpp (modified) (1 diff)
• VMM/VMMAll/GICAll.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/ConsoleImplConfigArmV8.cpp

@@ -420 +420 @@
 #else
         /* On Linux we default to the KVM in-kernel GIC for now. */
-        InsertConfigNode(pDevices, "gic-kvm",               &pDev);
+        InsertConfigNode(pDevices, "gic-nem",               &pDev);
 #endif
         InsertConfigNode(pDev,     "0",                     &pInst);

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

@@ -1293 +1293 @@
     /** @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);
     /* These should be handled in the kernel and never be set from here. */
-    AssertReturn(!pGic->fKvmGic, VERR_NEM_IPE_6);
-# else
-#  error "Impossible to call the KVM in-kernel GIC from this context!"
-# endif
+    AssertReturn(!pGic->fNemGic, VERR_NEM_IPE_6);
+#else
+# error "Impossible to call the in-kernel GIC from this context!"
 #endif