Changeset 64353 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 21, 2016 12:13:14 PM (8 years ago)

Author:

vboxsync

Message:

PDM: Added a pPciDev parameter to PDMDEVHLPR3::pfnMMIOExPreRegister.

File:

• trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (2 diffs)

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

@@ -447 +447 @@
  */
 static DECLCALLBACK(int)
-pdmR3DevHlp_MMIOExPreRegister(PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS cbRegion, uint32_t fFlags, const char *pszDesc,
+pdmR3DevHlp_MMIOExPreRegister(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, uint32_t iRegion, RTGCPHYS cbRegion, uint32_t fFlags,
+                              const char *pszDesc,
                               RTHCPTR pvUser, PFNIOMMMIOWRITE pfnWrite, PFNIOMMMIOREAD pfnRead, PFNIOMMMIOFILL pfnFill,
                               RTR0PTR pvUserR0, const char *pszWriteR0, const char *pszReadR0, const char *pszFillR0,
@@ -455 +456 @@
     PVM pVM = pDevIns->Internal.s.pVMR3;
     VM_ASSERT_EMT(pVM);
-    LogFlow(("pdmR3DevHlp_MMIOExPreRegister: caller='%s'/%d: iRegion=%#x cbRegion=%#RGp fFlags=%RX32 pszDesc=%p:{%s}\n"
+    LogFlow(("pdmR3DevHlp_MMIOExPreRegister: caller='%s'/%d: pPciDev=%p:{%#x} iRegion=%#x cbRegion=%#RGp fFlags=%RX32 pszDesc=%p:{%s}\n"
              "                               pvUser=%p pfnWrite=%p pfnRead=%p pfnFill=%p\n"
              "                               pvUserR0=%p pszWriteR0=%s pszReadR0=%s pszFillR0=%s\n"
              "                               pvUserRC=%p pszWriteRC=%s pszReadRC=%s pszFillRC=%s\n",
-             pDevIns->pReg->szName, pDevIns->iInstance, iRegion, cbRegion, fFlags, pszDesc, pszDesc,
+             pDevIns->pReg->szName, pDevIns->iInstance, pPciDev, pPciDev ? pPciDev->devfn : UINT32_MAX, iRegion, cbRegion,
+             fFlags, pszDesc, pszDesc,
              pvUser, pfnWrite, pfnRead, pfnFill,
              pvUserR0, pszWriteR0, pszReadR0, pszFillR0,
              pvUserRC, pszWriteRC, pszReadRC, pszFillRC));
+    NOREF(pPciDev);
 
     /*