Changeset 11183 in vbox for trunk/src/VBox/Devices/Storage/DevATA.cpp

Timestamp:

Aug 6, 2008 4:53:38 PM (16 years ago)

Author:

vboxsync

Message:

DevATA: Use CFGM*Def().

File:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -5532 +5532 @@
                                 N_("PIIX3 configuration error: unknown option specified"));
 
-    rc = CFGMR3QueryBool(pCfgHandle, "GCEnabled", &fGCEnabled);
-    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        fGCEnabled = true;
-    else if (VBOX_FAILURE(rc))
+    rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &fGCEnabled, true);
+    if (VBOX_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("PIIX3 configuration error: failed to read GCEnabled as boolean"));
     Log(("%s: fGCEnabled=%d\n", __FUNCTION__, fGCEnabled));
 
-    rc = CFGMR3QueryBool(pCfgHandle, "R0Enabled", &fR0Enabled);
-    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        fR0Enabled = true;
-    else if (VBOX_FAILURE(rc))
+    rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &fR0Enabled, true);
+    if (VBOX_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("PIIX3 configuration error: failed to read R0Enabled as boolean"));
     Log(("%s: fR0Enabled=%d\n", __FUNCTION__, fR0Enabled));
 
-    rc = CFGMR3QueryU32(pCfgHandle, "IRQDelay", &DelayIRQMillies);
-    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        DelayIRQMillies = 0;
-    else if (VBOX_FAILURE(rc))
+    rc = CFGMR3QueryU32Def(pCfgHandle, "IRQDelay", &DelayIRQMillies, 0);
+    if (VBOX_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("PIIX3 configuration error: failed to read IRQDelay as integer"));
@@ -5557 +5551 @@
     Assert(DelayIRQMillies < 50);
 
-    rc = CFGMR3QueryBool(pCfgHandle, "PIIX4", &pData->fPIIX4);
-    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        pData->fPIIX4 = false;
-    else if (VBOX_FAILURE(rc))
+    rc = CFGMR3QueryBoolDef(pCfgHandle, "PIIX4", &pData->fPIIX4, false);
+    if (VBOX_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("PIIX3 configuration error: failed to read PIIX4 as boolean"));