Changeset 107308 in vbox for trunk/src/VBox/VMM/VMMR3/GICR3Nem-linux.cpp

Timestamp:

Dec 13, 2024 8:09:39 AM (5 weeks ago)

Author:

vboxsync

Message:

VMM: bugref:10759 Refactor GIC for use with different backends.

File:

• trunk/src/VBox/VMM/VMMR3/GICR3Nem-linux.cpp (modified) (6 diffs)

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

@@ -34 +34 @@
 #include "GICInternal.h"
 #include "NEMInternal.h" /* Need access to the VM file descriptor. */
-#include <VBox/vmm/gic.h>
+#include <VBox/vmm/pdmgic.h>
 #include <VBox/vmm/cpum.h>
 #include <VBox/vmm/hm.h>
@@ -101 +101 @@
 
 /**
- * Common worker for GICR3KvmSpiSet() and GICR3KvmPpiSet().
+ * Common worker for gicR3KvmSpiSet() and gicR3KvmPpiSet().
  *
  * @returns VBox status code.
@@ -138 +138 @@
  * @param   fAsserted   Flag whether the interrupt is asserted (true) or not (false).
  */
-VMMR3_INT_DECL(int) GICR3NemSpiSet(PVMCC pVM, uint32_t uIntId, bool fAsserted)
+static DECLCALLBACK(int) gicR3KvmSetSpi(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) GICR3NemPpiSet(PVMCPUCC pVCpu, uint32_t uIntId, bool fAsserted)
+static DECLCALLBACK(int) gicR3KvmSetPpi(PVMCPUCC pVCpu, uint32_t uIntId, bool fAsserted)
 {
     PPDMDEVINS pDevIns = VMCPU_TO_DEVINS(pVCpu);
 
-    return gicR3KvmSetIrq(pDevIns, pVCpu->idCpu, KVM_ARM_IRQ_TYPE_SPI,
+    return gicR3KvmSetIrq(pDevIns, pVCpu->idCpu, KVM_ARM_IRQ_TYPE_PPI,
                           uIntId + GIC_INTID_RANGE_PPI_START, fAsserted);
 }
@@ -294 +294 @@
      * Register the GIC with PDM.
      */
-    rc = PDMDevHlpApicRegister(pDevIns);
+    rc = PDMDevHlpIcRegister(pDevIns);
+    AssertLogRelRCReturn(rc, rc);
+
+    rc = PDMGicRegisterBackend(pVM, PDMGICBACKENDTYPE_KVM, &g_GicKvmBackend);
     AssertLogRelRCReturn(rc, rc);
 
@@ -405 +408 @@
 };
 
+/**
+ * The KVM GIC backend.
+ */
+const PDMGICBACKEND g_GicKvmBackend =
+{
+    /* .pfnReadSysReg = */  NULL,
+    /* .pfnWriteSysReg = */ NULL,
+    /* .pfnSetSpi = */      gicR3KvmSetSpi,
+    /* .pfnSetPpi = */      gicR3KvmSetPpi,
+};
+
 #endif /* !VBOX_DEVICE_STRUCT_TESTCASE */