VirtualBox

Changeset 91944 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Oct 21, 2021 1:02:36 PM (3 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
147750
Message:

VMM,Devices: Eliminate direct calls to DBGFR3* and use the device helper callbacks, bugref:10074

Location:
trunk/src/VBox
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Audio/DevIchAc97.cpp

    r91735 r91944  
    28332833# ifdef LOG_ENABLED
    28342834                            if (LogIsFlowEnabled())
    2835                                 ichac97R3DbgPrintBdl(pDevIns, pThis, pStream, DBGFR3InfoLogHlp(), "ichac97IoPortNabmWrite: ");
     2835                                ichac97R3DbgPrintBdl(pDevIns, pThis, pStream, PDMDevHlpDBGFInfoLogHlp(pDevIns), "ichac97IoPortNabmWrite: ");
    28362836# endif
    28372837                            ichac97R3StreamEnable(pDevIns, pThis, pThisCC, pStream, pStreamCC, true /* fEnable */);

  • trunk/src/VBox/Devices/Network/DevVirtioNet.cpp

    r91069 r91944  
    19251925
    19261926    /* Save the common part */
    1927     int rc = vpciR3SaveExec(pHlp, &pThis->VPCI, pSSM);
     1927    int rc = vpciR3SaveExec(pDevIns, pHlp, &pThis->VPCI, pSSM);
    19281928    AssertRCReturn(rc, rc);
    19291929
    … …  
    19751975        LogRel(("%s: The mac address differs: config=%RTmac saved=%RTmac\n", INSTANCE(pThis), &pThis->macConfigured, &macConfigured));
    19761976
    1977     rc = vpciR3LoadExec(pHlp, &pThis->VPCI, pSSM, uVersion, uPass, VNET_N_QUEUES);
     1977    rc = vpciR3LoadExec(pDevIns, pHlp, &pThis->VPCI, pSSM, uVersion, uPass, VNET_N_QUEUES);
    19781978    AssertRCReturn(rc, rc);
    19791979

  • trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

    r91921 r91944  
    597597    {
    598598        VMMDevReqNtBugCheck const *pReq = (VMMDevReqNtBugCheck const *)pReqHdr;
    599         DBGFR3ReportBugCheck(PDMDevHlpGetVM(pDevIns), PDMDevHlpGetVMCPU(pDevIns), DBGFEVENT_BSOD_VMMDEV,
    600                              pReq->uBugCheck, pReq->auParameters[0], pReq->auParameters[1],
    601                              pReq->auParameters[2], pReq->auParameters[3]);
     599        PDMDevHlpDBGFReportBugCheck(pDevIns, DBGFEVENT_BSOD_VMMDEV,
     600                                    pReq->uBugCheck, pReq->auParameters[0], pReq->auParameters[1],
     601                                    pReq->auParameters[2], pReq->auParameters[3]);
    602602    }
    603603    else if (pReqHdr->size == sizeof(VMMDevRequestHeader))
    604604    {
    605605        LogRel(("VMMDev: NT BugCheck w/o data.\n"));
    606         DBGFR3ReportBugCheck(PDMDevHlpGetVM(pDevIns), PDMDevHlpGetVMCPU(pDevIns), DBGFEVENT_BSOD_VMMDEV,
    607                              0, 0, 0, 0, 0);
     606        PDMDevHlpDBGFReportBugCheck(pDevIns, DBGFEVENT_BSOD_VMMDEV, 0, 0, 0, 0, 0);
    608607    }
    609608    else
    … …  
    26312630     * Write the core file.
    26322631     */
    2633     PUVM pUVM = PDMDevHlpGetUVM(pDevIns);
    2634     return DBGFR3CoreWrite(pUVM, szCorePath, true /*fReplaceFile*/);
     2632    return PDMDevHlpDBGFCoreWrite(pDevIns, szCorePath, true /*fReplaceFile*/);
    26352633}
    26362634

  • trunk/src/VBox/Devices/VMMDev/VMMDevTesting.cpp

    r90609 r91944  
    260260    if (cchValueNm && pszRegNm && *pszRegNm)
    261261    {
    262         PUVM        pUVM  = PDMDevHlpGetUVM(pDevIns);
    263         PVM         pVM   = PDMDevHlpGetVM(pDevIns);
    264         VMCPUID     idCpu = VMMGetCpuId(pVM);
     262        VMCPUID     idCpu = PDMDevHlpGetCurrentCpuId(pDevIns);
    265263        uint64_t    u64Value;
    266         int rc2 = DBGFR3RegNmQueryU64(pUVM, idCpu, pszRegNm, &u64Value);
     264        int rc2 = PDMDevHlpDBGFRegNmQueryU64(pDevIns, idCpu, pszRegNm, &u64Value);
    267265        if (RT_SUCCESS(rc2))
    268266        {
    … …  
    271269            char szFormat[128], szValue[128];
    272270            RTStrPrintf(szFormat, sizeof(szFormat), "%%VR{%s}", pszRegNm);
    273             rc2 = DBGFR3RegPrintf(pUVM, idCpu, szValue, sizeof(szValue), szFormat);
     271            rc2 = PDMDevHlpDBGFRegPrintf(pDevIns, idCpu, szValue, sizeof(szValue), szFormat);
    274272            if (RT_SUCCESS(rc2))
    275273                VMMDEV_TESTING_OUTPUT(("testing: VALUE '%s'%*s: %16s {reg=%s}%s\n",

  • trunk/src/VBox/Devices/VirtIO/Virtio.cpp

    r90447 r91944  
    693693
    694694# ifdef LOG_ENABLED
    695 void vpciR3DumpState(PVPCISTATE pThis, const char *pcszCaller)
     695void vpciR3DumpState(PPDMDEVINS pDevIns, PVPCISTATE pThis, const char *pcszCaller)
    696696{
    697697    if (LogIs2Enabled())
    698698    {
    699699        Log2(("vpciR3DumpState: (called from %s)\n", pcszCaller));
    700         vpciR3DumpStateWorker(pThis, DBGFR3InfoLogHlp());
     700        vpciR3DumpStateWorker(pThis, PDMDevHlpDBGFInfoLogHlp(pDevIns));
    701701    }
    702702}
    … …  
    709709 *
    710710 * @returns VBox status code.
     711 * @param   pDevIns     The device insatnce data.
    711712 * @param   pHlp        The device helpers.
    712713 * @param   pThis       The shared virtio core instance data.
    713714 * @param   pSSM        The handle to the saved state.
    714715 */
    715 int vpciR3SaveExec(PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM)
    716 {
    717     vpciR3DumpState(pThis, "vpciR3SaveExec");
     716int vpciR3SaveExec(PPDMDEVINS pDevIns, PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM)
     717{
     718    vpciR3DumpState(pDevIns, pThis, "vpciR3SaveExec");
    718719
    719720    pHlp->pfnSSMPutU32(pSSM, pThis->uGuestFeatures);
    … …  
    741742 *
    742743 * @returns VBox status code.
     744 * @param   pDevIns     The device insatnce data.
    743745 * @param   pHlp        The device helpers.
    744746 * @param   pThis       The shared virtio core instance data.
    … …  
    748750 * @param   cQueues     The default queue count (for old states).
    749751 */
    750 int vpciR3LoadExec(PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass, uint32_t cQueues)
     752int vpciR3LoadExec(PPDMDEVINS pDevIns, PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass, uint32_t cQueues)
    751753{
    752754    int rc;
    … …  
    790792    }
    791793
    792     vpciR3DumpState(pThis, "vpciLoadExec");
     794    vpciR3DumpState(pDevIns, pThis, "vpciLoadExec");
    793795
    794796    return VINF_SUCCESS;

  • trunk/src/VBox/Devices/VirtIO/Virtio.h

    r90447 r91944  
    283283void  vpciR3SetWriteLed(PVPCISTATE pThis, bool fOn);
    284284void  vpciR3SetReadLed(PVPCISTATE pThis, bool fOn);
    285 int   vpciR3SaveExec(PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM);
    286 int   vpciR3LoadExec(PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass, uint32_t cQueues);
     285int   vpciR3SaveExec(PPDMDEVINS pDevIns, PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM);
     286int   vpciR3LoadExec(PPDMDEVINS pDevIns, PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass, uint32_t cQueues);
    287287void  vpciR3DumpStateWorker(PVPCISTATE pThis, PCDBGFINFOHLP pHlp);
    288288

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

    r91935 r91944  
    14881488    LogFlow(("pdmR3DevHlp_DBGFTraceBuf: caller='%s'/%d: returns %p\n", pDevIns->pReg->szName, pDevIns->iInstance, hTraceBuf));
    14891489    return hTraceBuf;
     1490}
     1491
     1492
     1493/** @interface_method_impl{PDMDEVHLPR3,pfnDBGFReportBugCheck} */
     1494static DECLCALLBACK(VBOXSTRICTRC) pdmR3DevHlp_DBGFReportBugCheck(PPDMDEVINS pDevIns, DBGFEVENTTYPE enmEvent, uint64_t uBugCheck,
     1495                                                                 uint64_t uP1, uint64_t uP2, uint64_t uP3, uint64_t uP4)
     1496{
     1497    PDMDEV_ASSERT_DEVINS(pDevIns);
     1498    LogFlow(("pdmR3DevHlp_DBGFReportBugCheck: caller='%s'/%d: enmEvent=%u uBugCheck=%#x uP1=%#x uP2=%#x uP3=%#x uP4=%#x\n",
     1499             pDevIns->pReg->szName, pDevIns->iInstance, enmEvent, uBugCheck, uP1, uP2, uP3, uP4));
     1500
     1501    PVM pVM = pDevIns->Internal.s.pVMR3;
     1502    VM_ASSERT_EMT(pVM);
     1503    VBOXSTRICTRC rcStrict = DBGFR3ReportBugCheck(pVM, VMMGetCpu(pVM), enmEvent, uBugCheck, uP1, uP2, uP3, uP4);
     1504
     1505    LogFlow(("pdmR3DevHlp_DBGFReportBugCheck: caller='%s'/%d: returns %Rrc\n",
     1506             pDevIns->pReg->szName, pDevIns->iInstance, VBOXSTRICTRC_VAL(rcStrict)));
     1507    return rcStrict;
     1508}
     1509
     1510
     1511/** @interface_method_impl{PDMDEVHLPR3,pfnDBGFCoreWrite} */
     1512static DECLCALLBACK(int) pdmR3DevHlp_DBGFCoreWrite(PPDMDEVINS pDevIns, const char *pszFilename, bool fReplaceFile)
     1513{
     1514    PDMDEV_ASSERT_DEVINS(pDevIns);
     1515    LogFlow(("pdmR3DevHlp_DBGFCoreWrite: caller='%s'/%d: pszFilename=%p:{%s} fReplaceFile=%RTbool\n",
     1516             pDevIns->pReg->szName, pDevIns->iInstance, pszFilename, pszFilename, fReplaceFile));
     1517
     1518    int rc = DBGFR3CoreWrite(pDevIns->Internal.s.pVMR3->pUVM, pszFilename, fReplaceFile);
     1519
     1520    LogFlow(("pdmR3DevHlp_DBGFCoreWrite: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
     1521    return rc;
     1522}
     1523
     1524
     1525/** @interface_method_impl{PDMDEVHLPR3,pfnDBGFInfoLogHlp} */
     1526static DECLCALLBACK(PCDBGFINFOHLP) pdmR3DevHlp_DBGFInfoLogHlp(PPDMDEVINS pDevIns)
     1527{
     1528    PDMDEV_ASSERT_DEVINS(pDevIns); RT_NOREF(pDevIns);
     1529    LogFlow(("pdmR3DevHlp_DBGFInfoLogHlp: caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance));
     1530
     1531    PCDBGFINFOHLP pHlp = DBGFR3InfoLogHlp();
     1532
     1533    LogFlow(("pdmR3DevHlp_DBGFInfoLogHlp: caller='%s'/%d: returns %p\n", pDevIns->pReg->szName, pDevIns->iInstance, pHlp));
     1534    return pHlp;
     1535}
     1536
     1537
     1538/** @interface_method_impl{PDMDEVHLPR3,pfnDBGFRegNmQueryU64} */
     1539static DECLCALLBACK(int) pdmR3DevHlp_DBGFRegNmQueryU64(PPDMDEVINS pDevIns, VMCPUID idDefCpu, const char *pszReg, uint64_t *pu64)
     1540{
     1541    PDMDEV_ASSERT_DEVINS(pDevIns);
     1542    LogFlow(("pdmR3DevHlp_DBGFRegNmQueryU64: caller='%s'/%d: idDefCpu=%u pszReg=%p:{%s} pu64=%p\n",
     1543             pDevIns->pReg->szName, pDevIns->iInstance, idDefCpu, pszReg, pszReg, pu64));
     1544
     1545    int rc = DBGFR3RegNmQueryU64(pDevIns->Internal.s.pVMR3->pUVM, idDefCpu, pszReg, pu64);
     1546
     1547    LogFlow(("pdmR3DevHlp_DBGFRegNmQueryU64: caller='%s'/%d: returns %Rrc *pu64=%#RX64\n",
     1548             pDevIns->pReg->szName, pDevIns->iInstance, rc, *pu64));
     1549    return rc;
     1550}
     1551
     1552
     1553/** @interface_method_impl{PDMDEVHLPR3,pfnDBGFRegPrintfV} */
     1554static DECLCALLBACK(int) pdmR3DevHlp_DBGFRegPrintfV(PPDMDEVINS pDevIns, VMCPUID idCpu, char *pszBuf, size_t cbBuf,
     1555                                                    const char *pszFormat, va_list va)
     1556{
     1557    PDMDEV_ASSERT_DEVINS(pDevIns);
     1558    LogFlow(("pdmR3DevHlp_DBGFRegPrintfV: caller='%s'/%d: idCpu=%u pszBuf=%p cbBuf=%u pszFormat=%p:{%s}\n",
     1559             pDevIns->pReg->szName, pDevIns->iInstance, idCpu, pszBuf, cbBuf, pszFormat, pszFormat));
     1560
     1561    int rc = DBGFR3RegPrintfV(pDevIns->Internal.s.pVMR3->pUVM, idCpu, pszBuf, cbBuf, pszFormat, va);
     1562
     1563    LogFlow(("pdmR3DevHlp_DBGFRegPrintfV: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
     1564    return rc;
    14901565}
    14911566
    … …  
    48194894    pdmR3DevHlp_DBGFRegRegister,
    48204895    pdmR3DevHlp_DBGFTraceBuf,
     4896    pdmR3DevHlp_DBGFReportBugCheck,
     4897    pdmR3DevHlp_DBGFCoreWrite,
     4898    pdmR3DevHlp_DBGFInfoLogHlp,
     4899    pdmR3DevHlp_DBGFRegNmQueryU64,
     4900    pdmR3DevHlp_DBGFRegPrintfV,
    48214901    pdmR3DevHlp_STAMRegister,
    48224902    pdmR3DevHlp_STAMRegisterV,
    … …  
    52015281    pdmR3DevHlp_DBGFRegRegister,
    52025282    pdmR3DevHlp_DBGFTraceBuf,
     5283    pdmR3DevHlp_DBGFReportBugCheck,
     5284    pdmR3DevHlp_DBGFCoreWrite,
     5285    pdmR3DevHlp_DBGFInfoLogHlp,
     5286    pdmR3DevHlp_DBGFRegNmQueryU64,
     5287    pdmR3DevHlp_DBGFRegPrintfV,
    52035288    pdmR3DevHlp_STAMRegister,
    52045289    pdmR3DevHlp_STAMRegisterV,
    … …  
    58545939    pdmR3DevHlp_DBGFRegRegister,
    58555940    pdmR3DevHlp_DBGFTraceBuf,
     5941    pdmR3DevHlp_DBGFReportBugCheck,
     5942    pdmR3DevHlp_DBGFCoreWrite,
     5943    pdmR3DevHlp_DBGFInfoLogHlp,
     5944    pdmR3DevHlp_DBGFRegNmQueryU64,
     5945    pdmR3DevHlp_DBGFRegPrintfV,
    58565946    pdmR3DevHlp_STAMRegister,
    58575947    pdmR3DevHlp_STAMRegisterV,
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