Changeset 20117 in vbox

Timestamp:

May 28, 2009 1:09:22 PM (16 years ago)

Author:

vboxsync

Message:

DevACPI.cpp: Use the scope to avoid bugs like r47866 fixed.

File:

• trunk/src/VBox/Devices/PC/DevACPI.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -1790 +1790 @@
 static DECLCALLBACK(int) acpiConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
 {
-    int rc;
-    ACPIState *s = PDMINS_2_DATA(pDevIns, ACPIState *);
-    uint32_t rsdp_addr;
+    ACPIState *s   = PDMINS_2_DATA(pDevIns, ACPIState *);
     PCIDevice *dev = &s->dev;
-    bool fGCEnabled;
-    bool fR0Enabled;
 
     /* Validate and read the configuration. */
@@ -1817 +1813 @@
 
     /* query whether we are supposed to present an IOAPIC */
-    rc = CFGMR3QueryU8Def(pCfgHandle, "IOAPIC", &s->u8UseIOApic, 1);
+    int rc = CFGMR3QueryU8Def(pCfgHandle, "IOAPIC", &s->u8UseIOApic, 1);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
@@ -1860 +1856 @@
         s->fShowCpu = true;
 
+    bool fGCEnabled;
     rc = CFGMR3QueryBool(pCfgHandle, "GCEnabled", &fGCEnabled);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
@@ -1867 +1864 @@
                                 N_("Configuration error: Failed to read \"GCEnabled\""));
 
+    bool fR0Enabled;
     rc = CFGMR3QueryBool(pCfgHandle, "R0Enabled", &fR0Enabled);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
@@ -1875 +1873 @@
 
     /* */
-    rsdp_addr = find_rsdp_space();
+    uint32_t rsdp_addr = find_rsdp_space();
     if (!rsdp_addr)
         return PDMDEV_SET_ERROR(pDevIns, VERR_NO_MEMORY,