Changeset 105687 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Aug 15, 2024 12:45:46 PM (5 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

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• GICR3.cpp (modified) (1 diff)
• GICR3Nem-darwin.cpp (added)
• GICR3Nem-linux.cpp (moved) (moved from trunk/src/VBox/VMM/VMMR3/GICR3Kvm.cpp ) (4 diffs)
• PDMDevice.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/GICR3.cpp

@@ -70 +70 @@
     GIC_SYSREGRANGE(ARMV8_AARCH64_SYSREG_ICC_DIR_EL1,   ARMV8_AARCH64_SYSREG_ICC_SGI0R_EL1,   "ICC_DIR_EL1 - ICC_SGI0R_EL1"),
     GIC_SYSREGRANGE(ARMV8_AARCH64_SYSREG_ICC_IAR1_EL1,  ARMV8_AARCH64_SYSREG_ICC_IGRPEN1_EL1, "ICC_IAR1_EL1 - ICC_IGRPEN1_EL1"),
+    GIC_SYSREGRANGE(ARMV8_AARCH64_SYSREG_ICC_SRE_EL2,   ARMV8_AARCH64_SYSREG_ICC_SRE_EL2,     "ICC_SRE_EL2")
 };
 

trunk/src/VBox/VMM/VMMR3/GICR3Nem-linux.cpp

@@ -138 +138 @@
  * @param   fAsserted   Flag whether the interrupt is asserted (true) or not (false).
  */
-VMMR3_INT_DECL(int) GICR3KvmSpiSet(PVMCC pVM, uint32_t uIntId, bool fAsserted)
+VMMR3_INT_DECL(int) GICR3NemSpiSet(PVMCC pVM, uint32_t uIntId, bool fAsserted)
 {
     PGIC pGic = VM_TO_GIC(pVM);
@@ -157 +157 @@
  * @param   fAsserted   Flag whether the interrupt is asserted (true) or not (false).
  */
-VMMR3_INT_DECL(int) GICR3KvmPpiSet(PVMCPUCC pVCpu, uint32_t uIntId, bool fAsserted)
+VMMR3_INT_DECL(int) GICR3NemPpiSet(PVMCPUCC pVCpu, uint32_t uIntId, bool fAsserted)
 {
     PPDMDEVINS pDevIns = VMCPU_TO_DEVINS(pVCpu);
@@ -276 +276 @@
      */
     pGic->pDevInsR3 = pDevIns;
-    pGic->fKvmGic   = true;
+    pGic->fNemGic   = true;
     pThis->pDevIns  = pDevIns;
     pThis->fdKvmVm  = pVM->nem.s.fdVm;
@@ -359 +359 @@
  * GIC device registration structure.
  */
-const PDMDEVREG g_DeviceGICKvm =
+const PDMDEVREG g_DeviceGICNem =
 {
     /* .u32Version = */             PDM_DEVREG_VERSION,
     /* .uReserved0 = */             0,
-    /* .szName = */                 "gic-kvm",
+    /* .szName = */                 "gic-nem",
     /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_NEW_STYLE,
     /* .fClass = */                 PDM_DEVREG_CLASS_PIC,

trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp

@@ -686 +686 @@
     AssertRCReturn(rc, rc);
 
-# ifdef RT_OS_LINUX
-    /*
-     * Register the internal VMM GIC device, KVM variant.
-     */
-    rc = pdmR3DevReg_Register(&RegCB.Core, &g_DeviceGICKvm);
+    /*
+     * Register the internal VMM GIC device, NEM variant.
+     */
+    rc = pdmR3DevReg_Register(&RegCB.Core, &g_DeviceGICNem);
     AssertRCReturn(rc, rc);
-# endif
 #else
     /*