VirtualBox

Changeset 68594 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Aug 31, 2017 2:24:09 PM (8 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
117813
Message:

PDM: Address the todos for cleaning up the PDMDEVHLP structure, bring the reserved slots back to the nominal numver and bump the major version (20 ended up being used by 5.1). Eliminate redundant PDMDEVHLP version dependent conditional compilation

Location:
trunk/src/VBox
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/src/VBox/Devices/Bus/DevPCI.cpp

    r67870 r68594  
    12621262    PciBusReg.pszSetIrqRC             = fGCEnabled ? "pciSetIrq" : NULL;
    12631263    PciBusReg.pszSetIrqR0             = fR0Enabled ? "pciSetIrq" : NULL;
    1264 #if PDM_DEVHLPR3_VERSION >= PDM_VERSION_MAKE_PP(0xffe7, 20, 0)
    12651264    rc = PDMDevHlpPCIBusRegister(pDevIns, &PciBusReg, &pBus->pPciHlpR3, &pBus->iBus);
    1266 #else
    1267     rc = PDMDevHlpPCIBusRegister(pDevIns, &PciBusReg, &pBus->pPciHlpR3);
    1268     pBus->iBus = rc;
    1269 #endif
    12701265    if (RT_FAILURE(rc))
    12711266        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    16451640    PciBusReg.pszSetIrqRC             = fGCEnabled ? "pcibridgeSetIrq" : NULL;
    16461641    PciBusReg.pszSetIrqR0             = fR0Enabled ? "pcibridgeSetIrq" : NULL;
    1647 #if PDM_DEVHLPR3_VERSION >= PDM_VERSION_MAKE_PP(0xffe7, 20, 0)
    16481642    rc = PDMDevHlpPCIBusRegister(pDevIns, &PciBusReg, &pBus->pPciHlpR3, &pBus->iBus);
    1649 #else
    1650     rc = PDMDevHlpPCIBusRegister(pDevIns, &PciBusReg, &pBus->pPciHlpR3);
    1651     pBus->iBus = rc;
    1652 #endif
    16531643    if (RT_FAILURE(rc))
    16541644        return PDMDEV_SET_ERROR(pDevIns, rc,

  • TabularUnified trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

    r68423 r68594  
    29972997    PciBusReg.pszSetIrqRC             = fGCEnabled ? "ich9pciSetIrq" : NULL;
    29982998    PciBusReg.pszSetIrqR0             = fR0Enabled ? "ich9pciSetIrq" : NULL;
    2999 #if PDM_DEVHLPR3_VERSION >= PDM_VERSION_MAKE_PP(0xffe7, 20, 0)
    30002999    rc = PDMDevHlpPCIBusRegister(pDevIns, &PciBusReg, &pBus->pPciHlpR3, &pBus->iBus);
    3001 #else
    3002     rc = PDMDevHlpPCIBusRegister(pDevIns, &PciBusReg, &pBus->pPciHlpR3);
    3003     pBus->iBus = rc;
    3004 #endif
    30053000    if (RT_FAILURE(rc))
    30063001        return PDMDEV_SET_ERROR(pDevIns, rc,
    … …  
    33823377    PciBusReg.pszSetIrqRC             = fGCEnabled ? "ich9pcibridgeSetIrq" : NULL;
    33833378    PciBusReg.pszSetIrqR0             = fR0Enabled ? "ich9pcibridgeSetIrq" : NULL;
    3384 #if PDM_DEVHLPR3_VERSION >= PDM_VERSION_MAKE_PP(0xffe7, 20, 0)
    33853379    rc = PDMDevHlpPCIBusRegister(pDevIns, &PciBusReg, &pBus->pPciHlpR3, &pBus->iBus);
    3386 #else
    3387     rc = PDMDevHlpPCIBusRegister(pDevIns, &PciBusReg, &pBus->pPciHlpR3);
    3388     pBus->iBus = rc;
    3389 #endif
    33903380    if (RT_FAILURE(rc))
    33913381        return PDMDEV_SET_ERROR(pDevIns, rc,

  • TabularUnified trunk/src/VBox/VMM/VMMR0/PDMR0Device.cpp

    r68470 r68594  
    423423    pdmR0DevHlp_PCISetIrq,
    424424    pdmR0DevHlp_ISASetIrq,
     425    pdmR0DevHlp_IoApicSendMsi,
    425426    pdmR0DevHlp_PhysRead,
    426427    pdmR0DevHlp_PhysWrite,
    … …  
    440441    pdmR0DevHlp_TMTimeVirtGetNano,
    441442    pdmR0DevHlp_DBGFTraceBuf,
    442     pdmR0DevHlp_IoApicSendMsi,
     443    NULL,
    443444    NULL,
    444445    NULL,

  • TabularUnified trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

    r68470 r68594  
    18471847
    18481848
    1849 /** @interface_method_impl{PDMDEVHLPR3,pfnIoApicSendMsiNoWait} */
    1850 static DECLCALLBACK(void) pdmR3DevHlp_IoApicSendMsiNoWait(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, uint32_t uValue)
    1851 {
    1852     pdmR3DevHlp_IoApicSendMsi(pDevIns, GCPhys, uValue);
    1853 }
    1854 
    1855 
    18561849/** @interface_method_impl{PDMDEVHLPR3,pfnDriverAttach} */
    18571850static DECLCALLBACK(int) pdmR3DevHlp_DriverAttach(PPDMDEVINS pDevIns, uint32_t iLun, PPDMIBASE pBaseInterface, PPDMIBASE *ppBaseInterface, const char *pszDesc)
    … …  
    26382631
    26392632/** @interface_method_impl{PDMDEVHLPR3,pfnPCIBusRegister} */
    2640 #if PDM_DEVHLPR3_VERSION >= PDM_VERSION_MAKE_PP(0xffe7, 20, 0)
    26412633static DECLCALLBACK(int) pdmR3DevHlp_PCIBusRegister(PPDMDEVINS pDevIns, PPDMPCIBUSREG pPciBusReg,
    26422634                                                    PCPDMPCIHLPR3 *ppPciHlpR3, uint32_t *piBus)
    2643 #else
    2644 static DECLCALLBACK(int) pdmR3DevHlp_PCIBusRegister(PPDMDEVINS pDevIns, PPDMPCIBUSREG pPciBusReg, PCPDMPCIHLPR3 *ppPciHlpR3)
    2645 #endif
    2646 {
    2647     PDMDEV_ASSERT_DEVINS(pDevIns);
    2648     PVM pVM = pDevIns->Internal.s.pVMR3;
    2649     VM_ASSERT_EMT(pVM);
    2650 #if PDM_DEVHLPR3_VERSION >= PDM_VERSION_MAKE_PP(0xffe7, 20, 0)
     2635{
     2636    PDMDEV_ASSERT_DEVINS(pDevIns);
     2637    PVM pVM = pDevIns->Internal.s.pVMR3;
     2638    VM_ASSERT_EMT(pVM);
    26512639    LogFlow(("pdmR3DevHlp_PCIBusRegister: caller='%s'/%d: pPciBusReg=%p:{.u32Version=%#x, .pfnRegisterR3=%p, .pfnIORegionRegisterR3=%p, "
    26522640             ".pfnSetIrqR3=%p, .pszSetIrqRC=%p:{%s}, .pszSetIrqR0=%p:{%s}} ppPciHlpR3=%p piBus=%p\n",
    … …  
    26542642             pPciBusReg->pfnIORegionRegisterR3, pPciBusReg->pfnSetIrqR3, pPciBusReg->pszSetIrqRC, pPciBusReg->pszSetIrqRC,
    26552643             pPciBusReg->pszSetIrqR0, pPciBusReg->pszSetIrqR0, ppPciHlpR3, piBus));
    2656 #else
    2657     LogFlow(("pdmR3DevHlp_PCIBusRegister: caller='%s'/%d: pPciBusReg=%p:{.u32Version=%#x, .pfnRegisterR3=%p, .pfnIORegionRegisterR3=%p, "
    2658              ".pfnSetIrqR3=%p, .pszSetIrqRC=%p:{%s}, .pszSetIrqR0=%p:{%s}} ppPciHlpR3=%p\n",
    2659              pDevIns->pReg->szName, pDevIns->iInstance, pPciBusReg, pPciBusReg->u32Version, pPciBusReg->pfnRegisterR3,
    2660              pPciBusReg->pfnIORegionRegisterR3, pPciBusReg->pfnSetIrqR3, pPciBusReg->pszSetIrqRC, pPciBusReg->pszSetIrqRC,
    2661              pPciBusReg->pszSetIrqR0, pPciBusReg->pszSetIrqR0, ppPciHlpR3));
    2662 #endif
    26632644
    26642645    /*
    … …  
    27012682        return VERR_INVALID_PARAMETER;
    27022683    }
    2703 #if PDM_DEVHLPR3_VERSION >= PDM_VERSION_MAKE_PP(0xffe7, 20, 0)
    27042684    AssertLogRelMsgReturn(RT_VALID_PTR(piBus) || !piBus,
    27052685                          ("caller='%s'/%d: piBus=%p\n", pDevIns->pReg->szName, pDevIns->iInstance, piBus),
    27062686                          VERR_INVALID_POINTER);
    2707 #endif
    27082687
    27092688    /*
    … …  
    27772756    /* set the helper pointer and return. */
    27782757    *ppPciHlpR3 = &g_pdmR3DevPciHlp;
    2779 #if PDM_DEVHLPR3_VERSION >= PDM_VERSION_MAKE_PP(0xffe7, 20, 0)
    27802758    if (piBus)
    27812759        *piBus = iBus;
    27822760    LogFlow(("pdmR3DevHlp_PCIBusRegister: caller='%s'/%d: returns %Rrc *piBus=%u\n", pDevIns->pReg->szName, pDevIns->iInstance, VINF_SUCCESS, iBus));
    27832761    return VINF_SUCCESS;
    2784 #else
    2785     LogFlow(("pdmR3DevHlp_PCIBusRegister: caller='%s'/%d: returns %u\n", pDevIns->pReg->szName, pDevIns->iInstance, iBus));
    2786     return (int)iBus;
    2787 #endif
    27882762}
    27892763
    … …  
    36503624    pdmR3DevHlp_MMIOExMap,
    36513625    pdmR3DevHlp_MMIOExUnmap,
     3626    pdmR3DevHlp_MMIOExReduce,
    36523627    pdmR3DevHlp_MMHyperMapMMIO2,
    36533628    pdmR3DevHlp_MMIO2MapKernel,
    … …  
    36913666    pdmR3DevHlp_ISASetIrq,
    36923667    pdmR3DevHlp_ISASetIrqNoWait,
     3668    pdmR3DevHlp_IoApicSendMsi,
    36933669    pdmR3DevHlp_DriverAttach,
    36943670    pdmR3DevHlp_DriverDetach,
    … …  
    37253701    pdmR3DevHlp_VMGetSuspendReason,
    37263702    pdmR3DevHlp_VMGetResumeReason,
    3727     pdmR3DevHlp_MMIOExReduce,
    3728     pdmR3DevHlp_IoApicSendMsi,
    3729     pdmR3DevHlp_IoApicSendMsiNoWait,
     3703    0,
     3704    0,
     3705    0,
    37303706    0,
    37313707    0,
    … …  
    39073883    pdmR3DevHlp_MMIOExMap,
    39083884    pdmR3DevHlp_MMIOExUnmap,
     3885    pdmR3DevHlp_MMIOExReduce,
    39093886    pdmR3DevHlp_MMHyperMapMMIO2,
    39103887    pdmR3DevHlp_MMIO2MapKernel,
    … …  
    39483925    pdmR3DevHlp_ISASetIrq,
    39493926    pdmR3DevHlp_ISASetIrqNoWait,
     3927    pdmR3DevHlp_IoApicSendMsi,
    39503928    pdmR3DevHlp_DriverAttach,
    39513929    pdmR3DevHlp_DriverDetach,
    … …  
    39823960    pdmR3DevHlp_VMGetSuspendReason,
    39833961    pdmR3DevHlp_VMGetResumeReason,
    3984     pdmR3DevHlp_MMIOExReduce,
    3985     pdmR3DevHlp_IoApicSendMsi,
    3986     pdmR3DevHlp_IoApicSendMsiNoWait,
     3962    0,
     3963    0,
     3964    0,
    39873965    0,
    39883966    0,

  • TabularUnified trunk/src/VBox/VMM/VMMRC/PDMRCDevice.cpp

    r68470 r68594  
    409409    pdmRCDevHlp_PCISetIrq,
    410410    pdmRCDevHlp_ISASetIrq,
     411    pdmRCDevHlp_IoApicSendMsi,
    411412    pdmRCDevHlp_PhysRead,
    412413    pdmRCDevHlp_PhysWrite,
    … …  
    425426    pdmRCDevHlp_TMTimeVirtGetNano,
    426427    pdmRCDevHlp_DBGFTraceBuf,
    427     pdmRCDevHlp_IoApicSendMsi,
     428    NULL,
    428429    NULL,
    429430    NULL,
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette