Changeset 39091 in vbox for trunk/src/VBox/Devices/Bus

Timestamp:

Oct 24, 2011 1:58:22 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

74523

Message:

More parameter warning fixes; made PciIch9 check the saved state version.

Location:

trunk/src/VBox/Devices/Bus

Files:

• DevPCI.cpp (modified) (7 diffs)
• DevPciIch9.cpp (modified) (32 diffs)
• MsixCommon.cpp (modified) (3 diffs)

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

@@ -555 +555 @@
             }
 #else
+            NOREF(len);
             return VINF_IOM_HC_IOPORT_READ;
 #endif
@@ -568 +569 @@
             Log(("pci_config_read: %s: addr=%02x val=%08x len=%d\n", pci_dev->name, config_addr, *pu32, len));
 #else
+            NOREF(len);
             return VINF_IOM_HC_IOPORT_READ;
 #endif
@@ -1247 +1249 @@
 static DECLCALLBACK(int) pciGenericSaveExec(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, PSSMHANDLE pSSM)
 {
+    NOREF(pDevIns);
     return SSMR3PutMem(pSSM, &pPciDev->config[0], sizeof(pPciDev->config));
 }
@@ -1261 +1264 @@
 static DECLCALLBACK(int) pciGenericLoadExec(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, PSSMHANDLE pSSM)
 {
+    NOREF(pDevIns);
     return SSMR3GetMem(pSSM, &pPciDev->config[0], sizeof(pPciDev->config));
 }
@@ -1850 +1854 @@
 static DECLCALLBACK(int) pciIORegionRegister(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, int iRegion, uint32_t cbRegion, PCIADDRESSSPACE enmType, PFNPCIIOREGIONMAP pfnCallback)
 {
+    NOREF(pDevIns);
+
     /*
      * Validate.
@@ -1892 +1898 @@
                                                 PFNPCICONFIGWRITE pfnWrite, PPFNPCICONFIGWRITE ppfnWriteOld)
 {
+    NOREF(pDevIns);
+
     if (ppfnReadOld)
         *ppfnReadOld = pPciDev->Int.s.pfnConfigRead;
@@ -1971 +1979 @@
 {
     PPCIGLOBALS pGlobals = PDMINS_2_DATA(pDevIns, PPCIGLOBALS);
-    PPCIBUS     pBus = DEVINS_2_PCIBUS(pDevIns);
     uint16_t    router;
     uint8_t     irq_map;
     int         i;
+    NOREF(pszArgs);
 
     router = pGlobals->PIIX3State.dev.devfn;

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

@@ -179 +179 @@
 DECLINLINE(void) ich9pciPhysToPciAddr(PICH9PCIGLOBALS pGlobals, RTGCPHYS GCPhysAddr, PciAddress* pPciAddr)
 {
+    NOREF(pGlobals);
     pPciAddr->iBus          = (GCPhysAddr >> 20) & ((1<<6)       - 1);
     pPciAddr->iDeviceFunc   = (GCPhysAddr >> 12) & ((1<<(5+3))   - 1); // 5 bits - device, 3 bits - function
@@ -295 +296 @@
             {
                 AssertPtr(pBridgeDevice->Int.s.pfnBridgeConfigWrite);
-                pBridgeDevice->Int.s.pfnBridgeConfigWrite(pBridgeDevice->pDevIns, pAddr->iBus, pAddr->iDeviceFunc, pAddr->iRegister, val, cb);
+                pBridgeDevice->Int.s.pfnBridgeConfigWrite(pBridgeDevice->pDevIns, pAddr->iBus, pAddr->iDeviceFunc,
+                                                          pAddr->iRegister, val, cb);
             }
             else
@@ -301 +303 @@
                 // do nothing, bridge not found
             }
+            NOREF(rcReschedule);
 #else
             rc = rcReschedule;
-            goto out;
 #endif
         }
@@ -316 +318 @@
 #else
             rc = rcReschedule;
-            goto out;
 #endif
         }
     }
 
-  out:
     Log2(("ich9pciDataWriteAddr: %02x:%02x:%02x reg %x(%d) %x %Rrc\n",
           pAddr->iBus, pAddr->iDeviceFunc >> 3, pAddr->iDeviceFunc & 0x7, pAddr->iRegister,
@@ -398 +398 @@
             else
                 ich9pciNoMem(pu32, cb);
+            NOREF(rcReschedule);
 #else
             rc = rcReschedule;
-            goto out;
 #endif
         } else
@@ -414 +414 @@
 #else
             rc = rcReschedule;
-            goto out;
 #endif
         }
@@ -421 +420 @@
     }
 
-  out:
     Log3(("ich9pciDataReadAddr: %02x:%02x:%02x reg %x(%d) gave %x %Rrc\n",
           pPciAddr->iBus, pPciAddr->iDeviceFunc >> 3, pPciAddr->iDeviceFunc & 0x7, pPciAddr->iRegister,
@@ -486 +484 @@
 DECLINLINE(int) ich9pciSlotGetPirq(uint8_t uBus, uint8_t uDevFn, int iIrqNum)
 {
+    NOREF(uBus);
     int iSlotAddend = (uDevFn >> 3) - 1;
     return (iIrqNum + iSlotAddend) & 3;
@@ -594 +593 @@
     PciAddress aDest;
     uint32_t u32 = 0;
+    NOREF(pvUser);
 
     Log2(("ich9pciMcfgMMIOWrite: %RGp(%d) \n", GCPhysAddr, cb));
@@ -627 +627 @@
     PciAddress  aDest;
     uint32_t    rv;
+    NOREF(pvUser);
 
     LogFlow(("ich9pciMcfgMMIORead: %RGp(%d) \n", GCPhysAddr, cb));
@@ -750 +751 @@
 static void ich9pciUpdateMappings(PCIDevice* pDev)
 {
-    PICH9PCIBUS pBus = pDev->Int.s.CTX_SUFF(pBus);
     uint64_t uLast, uNew;
 
@@ -861 +861 @@
 static DECLCALLBACK(int) ich9pciRegisterMsi(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, PPDMMSIREG pMsiReg)
 {
+    NOREF(pDevIns);
     int rc;
 
@@ -899 +900 @@
 static DECLCALLBACK(int) ich9pciIORegionRegister(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, int iRegion, uint32_t cbRegion, PCIADDRESSSPACE enmType, PFNPCIIOREGIONMAP pfnCallback)
 {
+    NOREF(pDevIns);
+
     /*
      * Validate.
@@ -953 +956 @@
                                                     PFNPCICONFIGWRITE pfnWrite, PPFNPCICONFIGWRITE ppfnWriteOld)
 {
+    NOREF(pDevIns);
+
     if (ppfnReadOld)
         *ppfnReadOld = pPciDev->Int.s.pfnConfigRead;
@@ -972 +977 @@
 static DECLCALLBACK(int) ich9pciGenericSaveExec(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, PSSMHANDLE pSSM)
 {
+    NOREF(pDevIns);
     Assert(!pciDevIsPassthrough(pPciDev));
     return SSMR3PutMem(pSSM, &pPciDev->config[0], sizeof(pPciDev->config));
@@ -1304 +1310 @@
 
     Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
+    if (uVersion != VBOX_ICH9PCI_SAVED_STATE_VERSION_CURRENT)
+        return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
 
     /*
@@ -1325 +1333 @@
     }
 
-    void* pvMsixPage = RTMemTmpAllocZ(0x1000);
+    void *pvMsixPage = RTMemTmpAllocZ(0x1000);
+    AssertReturn(pvMsixPage, VERR_NO_TMP_MEMORY);
+
     /*
      * Iterate all the devices.
@@ -1337 +1347 @@
         rc = SSMR3GetU32(pSSM, &u32);
         if (RT_FAILURE(rc))
-            return rc;
+            break;
         if (u32 == (uint32_t)~0)
             break;
-        if (    u32 >= RT_ELEMENTS(pBus->apDevices)
-            ||  u32 < i)
-        {
-            AssertMsgFailed(("u32=%#x i=%#x\n", u32, i));
-            goto out;
-        }
+        AssertMsgBreak(u32 < RT_ELEMENTS(pBus->apDevices) && u32 >= i, ("u32=%#x i=%#x\n", u32, i));
 
         /* skip forward to the device checking that no new devices are present. */
@@ -1356 +1361 @@
                         PCIDevGetVendorId(pDev), PCIDevGetDeviceId(pDev)));
                 if (SSMR3HandleGetAfter(pSSM) != SSMAFTER_DEBUG_IT)
-                    return SSMR3SetCfgError(pSSM, RT_SRC_POS, N_("New device in slot %#x, %s (vendor=%#06x device=%#06x)"),
-                                            i, pDev->name, PCIDevGetVendorId(pDev), PCIDevGetDeviceId(pDev));
+                {
+                    rc = SSMR3SetCfgError(pSSM, RT_SRC_POS, N_("New device in slot %#x, %s (vendor=%#06x device=%#06x)"),
+                                          i, pDev->name, PCIDevGetVendorId(pDev), PCIDevGetDeviceId(pDev));
+                    break;
+                }
             }
         }
+        if (RT_FAILURE(rc))
+            break;
 
         /* get the data */
@@ -1370 +1380 @@
         SSMR3GetMem(pSSM, DevTmp.config, sizeof(DevTmp.config));
 
-        rc = SSMR3GetU32(pSSM, &DevTmp.Int.s.fFlags);
-        if (RT_FAILURE(rc))
-            goto out;
-
-        rc = SSMR3GetS32(pSSM, &DevTmp.Int.s.uIrqPinState);
-        if (RT_FAILURE(rc))
-            goto out;
-
-        rc = SSMR3GetU8(pSSM, &DevTmp.Int.s.u8MsiCapOffset);
-        if (RT_FAILURE(rc))
-            goto out;
-
-        rc = SSMR3GetU8(pSSM, &DevTmp.Int.s.u8MsiCapSize);
-        if (RT_FAILURE(rc))
-            goto out;
-
-        rc = SSMR3GetU8(pSSM, &DevTmp.Int.s.u8MsixCapOffset);
-        if (RT_FAILURE(rc))
-            goto out;
-
+        SSMR3GetU32(pSSM, &DevTmp.Int.s.fFlags);
+        SSMR3GetS32(pSSM, &DevTmp.Int.s.uIrqPinState);
+        SSMR3GetU8(pSSM, &DevTmp.Int.s.u8MsiCapOffset);
+        SSMR3GetU8(pSSM, &DevTmp.Int.s.u8MsiCapSize);
+        SSMR3GetU8(pSSM, &DevTmp.Int.s.u8MsixCapOffset);
         rc = SSMR3GetU8(pSSM, &DevTmp.Int.s.u8MsixCapSize);
         if (RT_FAILURE(rc))
-            goto out;
+            break;
 
         /* Load MSI-X page state */
@@ -1398 +1393 @@
         {
             Assert(pvMsixPage != NULL);
-            SSMR3GetMem(pSSM, pvMsixPage, 0x1000);
+            rc = SSMR3GetMem(pSSM, pvMsixPage, 0x1000);
             if (RT_FAILURE(rc))
-                goto out;
+                break;
         }
 
@@ -1410 +1405 @@
                     PCIDevGetVendorId(&DevTmp), PCIDevGetDeviceId(&DevTmp)));
             if (SSMR3HandleGetAfter(pSSM) != SSMAFTER_DEBUG_IT)
-                return SSMR3SetCfgError(pSSM, RT_SRC_POS, N_("Device in slot %#x has been removed! vendor=%#06x device=%#06x"),
-                                        i, PCIDevGetVendorId(&DevTmp), PCIDevGetDeviceId(&DevTmp));
+            {
+                rc = SSMR3SetCfgError(pSSM, RT_SRC_POS, N_("Device in slot %#x has been removed! vendor=%#06x device=%#06x"),
+                                      i, PCIDevGetVendorId(&DevTmp), PCIDevGetDeviceId(&DevTmp));
+                break;
+            }
             continue;
         }
 
         /* match the vendor id assuming that this will never be changed. */
-        if (    PCIDevGetVendorId(&DevTmp) != PCIDevGetVendorId(pDev))
-            return SSMR3SetCfgError(pSSM, RT_SRC_POS, N_("Device in slot %#x (%s) vendor id mismatch! saved=%.4Rhxs current=%.4Rhxs"),
-                                     i, pDev->name, PCIDevGetVendorId(&DevTmp), PCIDevGetVendorId(pDev));
+        if (PCIDevGetVendorId(&DevTmp) != PCIDevGetVendorId(pDev))
+        {
+            rc = SSMR3SetCfgError(pSSM, RT_SRC_POS, N_("Device in slot %#x (%s) vendor id mismatch! saved=%.4Rhxs current=%.4Rhxs"),
+                                  i, pDev->name, PCIDevGetVendorId(&DevTmp), PCIDevGetVendorId(pDev));
+            break;
+        }
 
         /* commit the loaded device config. */
@@ -1436 +1437 @@
     }
 
-  out:
-    if (pvMsixPage)
-        RTMemTmpFree(pvMsixPage);
+    RTMemTmpFree(pvMsixPage);
 
     return rc;
@@ -1453 +1452 @@
 static DECLCALLBACK(int) ich9pciGenericLoadExec(PPDMDEVINS pDevIns, PPCIDEVICE pPciDev, PSSMHANDLE pSSM)
 {
+    NOREF(pDevIns);
     Assert(!pciDevIsPassthrough(pPciDev));
     return SSMR3GetMem(pSSM, &pPciDev->config[0], sizeof(pPciDev->config));
@@ -1822 +1822 @@
 static DECLCALLBACK(int) ich9pciFakePCIBIOS(PPDMDEVINS pDevIns)
 {
-    unsigned    i;
-    uint8_t     elcr[2] = {0, 0};
     PICH9PCIGLOBALS pGlobals = PDMINS_2_DATA(pDevIns, PICH9PCIGLOBALS);
-    PVM         pVM = PDMDevHlpGetVM(pDevIns);
+    PVM             pVM = PDMDevHlpGetVM(pDevIns);
     Assert(pVM);
 
@@ -1844 +1842 @@
      * Init the devices.
      */
-    for (i = 0; i < 256; i++)
+    for (int i = 0; i < 256; i++)
     {
         ich9pciBiosInitDevice(pGlobals, 0, i);
@@ -1981 +1979 @@
     bool     fUpdateMappings = false;
     bool     fP2PBridge = false;
-    bool     fPassthrough = pciDevIsPassthrough(aDev);
+    /*bool     fPassthrough = pciDevIsPassthrough(aDev);*/
     uint8_t  u8HeaderType = ich9pciGetByte(aDev, VBOX_PCI_HEADER_TYPE);
 
@@ -2102 +2100 @@
 static bool assignPosition(PICH9PCIBUS pBus, PPCIDEVICE pPciDev, const char *pszName, int iDevFn, PciAddress* aPosition)
 {
+    NOREF(pszName);
     aPosition->iBus = 0;
     aPosition->iDeviceFunc = iDevFn;
@@ -2107 +2106 @@
 
     /* Explicit slot request */
-    if (iDevFn >=0 && iDevFn < (int)RT_ELEMENTS(pBus->apDevices))
+    if (iDevFn >= 0 && iDevFn < (int)RT_ELEMENTS(pBus->apDevices))
         return true;
 
@@ -2133 +2132 @@
 }
 
+#ifdef SOME_UNUSED_FUNCTION
 static bool hasHardAssignedDevsInSlot(PICH9PCIBUS pBus, int iSlot)
 {
@@ -2147 +2147 @@
            ;
 }
+#endif
 
 static int ich9pciRegisterInternal(PICH9PCIBUS pBus, int iDev, PPCIDEVICE pPciDev, const char *pszName)
@@ -2581 +2582 @@
 static void ich9pciResetDevice(PPCIDEVICE pDev)
 {
-    PICH9PCIBUS pBus = pDev->Int.s.CTX_SUFF(pBus);
-    int rc;
-
     /* Clear regions */
     for (int iRegion = 0; iRegion < PCI_NUM_REGIONS; iRegion++)

trunk/src/VBox/Devices/Bus/MsixCommon.cpp

@@ -116 +116 @@
 PDMBOTHCBDECL(int) msixMMIORead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
 {
-    /// @todo: qword accesses?
+    /// @todo qword accesses?
+    NOREF(pDevIns);
     AssertMsgReturn(cb == 4,
                     ("MSI-X must be accessed with 4-byte reads"),
@@ -153 +154 @@
 {
     Assert(enmType == PCI_ADDRESS_SPACE_MEM);
+    NOREF(iRegion); NOREF(enmType);
 
     int rc = PDMDevHlpMMIORegister(pPciDev->pDevIns, GCPhysAddress, cb, pPciDev,
@@ -323 +325 @@
         msixCheckPendingVectors(pDevIns, pPciHlp, pDev);
 }
-uint32_t MsixPciConfigRead (PPDMDEVINS pDevIns, PPCIDEVICE pDev, uint32_t u32Address, unsigned len)
+
+
+uint32_t MsixPciConfigRead(PPDMDEVINS pDevIns, PPCIDEVICE pDev, uint32_t u32Address, unsigned len)
 {
     int32_t iOff = u32Address - pDev->Int.s.u8MsixCapOffset;
+    NOREF(pDevIns);
 
     Assert(iOff >= 0 && (pciDevIsMsixCapable(pDev) && iOff < pDev->Int.s.u8MsixCapSize));