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

Timestamp:

Aug 2, 2016 4:21:40 PM (8 years ago)

Author:

vboxsync

Message:

Devices: gcc warnings

Location:

trunk/src/VBox/Devices/Bus

Files:

• DevPCI.cpp (modified) (1 diff)
• DevPciIch9.cpp (modified) (3 diffs)
• MsiCommon.cpp (modified) (2 diffs)

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

@@ -2141 +2141 @@
 static DECLCALLBACK(int)   pciR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
+    RT_NOREF1(iInstance);
     Assert(iInstance == 0);
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);

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

@@ -1943 +1943 @@
 {
     PICH9PCIGLOBALS pGlobals = PDMINS_2_DATA(pDevIns, PICH9PCIGLOBALS);
-    PVM             pVM = PDMDevHlpGetVM(pDevIns);
-    Assert(pVM);
 
     /*
@@ -1963 +1961 @@
      */
     for (int i = 0; i < 256; i++)
-    {
         ich9pciBiosInitDevice(pGlobals, 0, i);
-    }
 
     return VINF_SUCCESS;
@@ -2517 +2513 @@
 
 
-static DECLCALLBACK(int) ich9pciConstruct(PPDMDEVINS pDevIns,
-                                          int        iInstance,
-                                          PCFGMNODE  pCfg)
-{
+static DECLCALLBACK(int) ich9pciConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE  pCfg)
+{
+    RT_NOREF1(iInstance);
     Assert(iInstance == 0);
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);

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

@@ -201 +201 @@
 uint32_t MsiPciConfigRead (PPDMDEVINS pDevIns, PPCIDEVICE pDev, uint32_t u32Address, unsigned len)
 {
-    int32_t iOff = u32Address - pDev->Int.s.u8MsiCapOffset;
-
-    Assert(iOff >= 0 && (pciDevIsMsiCapable(pDev) && iOff < pDev->Int.s.u8MsiCapSize));
+    RT_NOREF1(pDevIns);
+#if defined(LOG_ENABLED) || defined(VBOX_STRICT)
+    int32_t off = u32Address - pDev->Int.s.u8MsiCapOffset;
+    Assert(off >= 0 && (pciDevIsMsiCapable(pDev) && off < pDev->Int.s.u8MsiCapSize));
+#endif
     uint32_t rv = 0;
 
@@ -221 +223 @@
     }
 
-    Log2(("MsiPciConfigRead: %d (%d) -> %x\n", iOff, len, rv));
+    Log2(("MsiPciConfigRead: %d (%d) -> %x\n", off, len, rv));
 
     return rv;