Changeset 15592 in vbox for trunk/src/VBox/Devices/Storage/DrvVD.cpp

Timestamp:

Dec 16, 2008 2:48:13 PM (16 years ago)

Author:

vboxsync

Message:

Main & DrvVD: fix a whole bunch of incorrect CFGM key updates, required to get iSCSI snapshots working.

File:

• trunk/src/VBox/Devices/Storage/DrvVD.cpp (modified) (5 diffs)

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

@@ -841 +841 @@
                                           "ReadOnly\0HonorZeroWrites\0"
                                           "HostIPStack\0");
-
-            rc = CFGMR3QueryBool(pCfgHandle, "HostIPStack", &fHostIP);
+        }
+        else
+        {
+            /* All other image configurations only contain image name and
+             * the format information. */
+            fValid = CFGMR3AreValuesValid(pCurNode, "Format\0Path\0");
+        }
+        if (!fValid)
+        {
+            rc = PDMDrvHlpVMSetError(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
+                                     RT_SRC_POS, N_("DrvVD: Configuration error: keys incorrect at level %d"), iLevel);
+            break;
+        }
+
+        if (pCurNode == pCfgHandle)
+        {
+            rc = CFGMR3QueryBool(pCurNode, "HostIPStack", &fHostIP);
             if (rc == VERR_CFGM_VALUE_NOT_FOUND)
             {
@@ -854 +869 @@
                 break;
             }
-        }
-        else
-        {
-            /* All other image configurations only contain image name and
-             * the format information. */
-            fValid = CFGMR3AreValuesValid(pCurNode, "Format\0Path\0");
-        }
-        if (!fValid)
-        {
-            rc = PDMDrvHlpVMSetError(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
-                                     RT_SRC_POS, N_("DrvVD: Configuration error: keys incorrect at level %d"), iLevel);
-            break;
+
+            rc = CFGMR3QueryBool(pCurNode, "HonorZeroWrites", &fHonorZeroWrites);
+            if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+            {
+                fHonorZeroWrites = false;
+                rc = VINF_SUCCESS;
+            }
+            else if (RT_FAILURE(rc))
+            {
+                rc = PDMDRV_SET_ERROR(pDrvIns, rc,
+                                      N_("DrvVD: Configuration error: Querying \"HonorZeroWrites\" as boolean failed"));
+                break;
+            }
+
+            rc = CFGMR3QueryBool(pCurNode, "ReadOnly", &fReadOnly);
+            if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+            {
+                fReadOnly = false;
+                rc = VINF_SUCCESS;
+            }
+            else if (RT_FAILURE(rc))
+            {
+                rc = PDMDRV_SET_ERROR(pDrvIns, rc,
+                                      N_("DrvVD: Configuration error: Querying \"ReadOnly\" as boolean failed"));
+                break;
+            }
         }
 
@@ -945 +974 @@
         }
 
-        rc = CFGMR3QueryStringAlloc(pCfgHandle, "Format", &pszFormat);
+        rc = CFGMR3QueryStringAlloc(pCurNode, "Format", &pszFormat);
         if (RT_FAILURE(rc))
         {
@@ -951 +980 @@
                                   N_("DrvVD: Configuration error: Querying \"Format\" as string failed"));
             break;
-        }
-
-        if (iLevel == 0)
-        {
-            rc = CFGMR3QueryBool(pCurNode, "ReadOnly", &fReadOnly);
-            if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-                fReadOnly = false;
-            else if (RT_FAILURE(rc))
-            {
-                rc = PDMDRV_SET_ERROR(pDrvIns, rc,
-                                      N_("DrvVD: Configuration error: Querying \"ReadOnly\" as boolean failed"));
-                break;
-            }
-
-            rc = CFGMR3QueryBool(pCfgHandle, "HonorZeroWrites", &fHonorZeroWrites);
-            if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-                fHonorZeroWrites = false;
-            else if (RT_FAILURE(rc))
-            {
-                rc = PDMDRV_SET_ERROR(pDrvIns, rc,
-                                      N_("DrvVD: Configuration error: Querying \"HonorZeroWrites\" as boolean failed"));
-                break;
-            }
-        }
-        else
-        {
-            fReadOnly = true;
-            fHonorZeroWrites = false;
         }
 
@@ -990 +991 @@
          */
         unsigned uOpenFlags;
-        if (fReadOnly)
+        if (fReadOnly || iLevel != 0)
             uOpenFlags = VD_OPEN_FLAGS_READONLY;
         else