- Timestamp:
- Oct 20, 2021 12:05:47 PM (3 years ago)
- File:
-
- 1 edited
-
trunk/src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Bus/DevPciIch9.cpp
r91888 r91889 3314 3314 PDMDEV_CHECK_VERSIONS_RETURN(pDevIns); 3315 3315 3316 PDEVPCIBUSCC pBusCC = PDMINS_2_DATA_CC(pDevIns, PDEVPCIBUSCC); 3317 PDEVPCIROOT pPciRoot = PDMINS_2_DATA(pDevIns, PDEVPCIROOT); 3318 PDEVPCIBUS pBus = &pPciRoot->PciBus; 3316 PDEVPCIBUSCC pBusCC = PDMINS_2_DATA_CC(pDevIns, PDEVPCIBUSCC); 3317 PDEVPCIROOT pPciRoot = PDMINS_2_DATA(pDevIns, PDEVPCIROOT); 3318 PCPDMDEVHLPR3 pHlp = pDevIns->pHlpR3; 3319 PDEVPCIBUS pBus = &pPciRoot->PciBus; 3319 3320 Assert(ASMMemIsZero(pPciRoot, sizeof(*pPciRoot))); /* code used to memset it for some funny reason. just temp insurance. */ 3320 3321 … … 3325 3326 3326 3327 /* query whether we got an IOAPIC */ 3327 int rc = CFGMR3QueryBoolDef(pCfg, "IOAPIC", &pPciRoot->fUseIoApic, false /** @todo default to true? */);3328 int rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "IOAPIC", &pPciRoot->fUseIoApic, false /** @todo default to true? */); 3328 3329 AssertRCReturn(rc, PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed to query boolean value \"IOAPIC\""))); 3329 3330 … … 3331 3332 return PDMDEV_SET_ERROR(pDevIns, rc, N_("Must use IO-APIC with ICH9 chipset")); 3332 3333 3333 rc = CFGMR3QueryU64Def(pCfg, "McfgBase", &pPciRoot->u64PciConfigMMioAddress, 0);3334 rc = pHlp->pfnCFGMQueryU64Def(pCfg, "McfgBase", &pPciRoot->u64PciConfigMMioAddress, 0); 3334 3335 AssertRCReturn(rc, PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed to read \"McfgBase\""))); 3335 3336 3336 rc = CFGMR3QueryU64Def(pCfg, "McfgLength", &pPciRoot->u64PciConfigMMioLength, 0);3337 rc = pHlp->pfnCFGMQueryU64Def(pCfg, "McfgLength", &pPciRoot->u64PciConfigMMioLength, 0); 3337 3338 AssertRCReturn(rc, PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed to read \"McfgLength\""))); 3338 3339 … … 3640 3641 { 3641 3642 PDMDEV_CHECK_VERSIONS_RETURN(pDevIns); 3643 PCPDMDEVHLPR3 pHlp = pDevIns->pHlpR3; 3642 3644 3643 3645 /* … … 3648 3650 /* check if we're supposed to implement a PCIe bridge. */ 3649 3651 bool fExpress; 3650 int rc = CFGMR3QueryBoolDef(pCfg, "ExpressEnabled", &fExpress, false);3652 int rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "ExpressEnabled", &fExpress, false); 3651 3653 AssertRCReturn(rc, PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: Failed to query boolean value \"ExpressEnabled\""))); 3652 3654 3653 3655 char szExpressPortType[80]; 3654 rc = CFGMR3QueryStringDef(pCfg, "ExpressPortType", szExpressPortType, sizeof(szExpressPortType), "RootCmplxIntEp");3656 rc = pHlp->pfnCFGMQueryStringDef(pCfg, "ExpressPortType", szExpressPortType, sizeof(szExpressPortType), "RootCmplxIntEp"); 3655 3657 AssertRCReturn(rc, PDMDEV_SET_ERROR(pDevIns, rc, N_("Configuration error: failed to read \"ExpressPortType\" as string"))); 3656 3658
Note:
See TracChangeset
for help on using the changeset viewer.

