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

Timestamp:

Jan 28, 2011 10:58:06 AM (14 years ago)

Author:

vboxsync

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

69710

Message:

various nits.

Location:

trunk/src/VBox/Devices/Bus

Files:

• DevPCI.cpp (modified) (4 diffs)
• DevPciIch9.cpp (modified) (7 diffs)

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

@@ -2024 +2024 @@
 static DECLCALLBACK(int)   pciConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
-    int rc;
     Assert(iInstance == 0);
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
 
     /*
@@ -2035 +2035 @@
     /* query whether we got an IOAPIC */
     bool fUseIoApic;
-    rc = CFGMR3QueryBoolDef(pCfg, "IOAPIC", &fUseIoApic, false);
+    int rc = CFGMR3QueryBoolDef(pCfg, "IOAPIC", &fUseIoApic, false);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
@@ -2417 +2417 @@
 static DECLCALLBACK(int)   pcibridgeConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
-    int rc;
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
 
     /*
@@ -2427 +2427 @@
     /* check if RC code is enabled. */
     bool fGCEnabled;
-    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
+    int rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,

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

@@ -1202 +1202 @@
      */
     uint8_t const fBridge = fIsBridge ? 2 : 1;
-    Assert(!PCIIsPassthrough(pDev)); 
+    Assert(!PCIIsPassthrough(pDev));
     uint8_t *pbDstConfig = &pDev->config[0];
 
@@ -1398 +1398 @@
 
         /* commit the loaded device config. */
-        Assert(!PCIIsPassthrough(pDev)); 
+        Assert(!PCIIsPassthrough(pDev));
         pciR3CommonRestoreConfig(pDev, &DevTmp.config[0], false ); /** @todo fix bridge fun! */
 
@@ -1756 +1756 @@
     }
 
-    AssertMsgReturn(u32Address + len <= 256, ("Read after end of PCI config space\n"), 
-                    0); 
+    AssertMsgReturn(u32Address + len <= 256, ("Read after end of PCI config space\n"),
+                    0);
     if (   PCIIsMsiCapable(aDev)
         && (u32Address >= aDev->Int.s.u8MsiCapOffset)
@@ -2274 +2274 @@
                                           PCFGMNODE  pCfg)
 {
-    int rc;
     Assert(iInstance == 0);
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
 
     /*
@@ -2291 +2291 @@
     /* query whether we got an IOAPIC */
     bool fUseIoApic;
-    rc = CFGMR3QueryBoolDef(pCfg, "IOAPIC", &fUseIoApic, false);
+    int rc = CFGMR3QueryBoolDef(pCfg, "IOAPIC", &fUseIoApic, false);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
@@ -2588 +2588 @@
                                                   PCFGMNODE  pCfg)
 {
-    int rc;
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
 
     /*
@@ -2598 +2598 @@
     /* check if RC code is enabled. */
     bool fGCEnabled;
-    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
+    int rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,