Changeset 24583 in vbox for trunk/src

Timestamp:

Nov 11, 2009 2:54:01 PM (15 years ago)

Author:

vboxsync

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

54718

Message:

DrvVD,ConsoleImpl2.cpp: Added a TempReadOnly argument for use on the teleporation target so we can teleport using images without hitting VERR_SHARING_VIOLATION.

Location:

trunk/src/VBox

Files:

• Devices/Storage/DrvVD.cpp (modified) (11 diffs)
• Main/ConsoleImpl2.cpp (modified) (1 diff)

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

@@ -903 +903 @@
             fValid = CFGMR3AreValuesValid(pCurNode,
                                           "Format\0Path\0"
-                                          "ReadOnly\0HonorZeroWrites\0"
+                                          "ReadOnly\0TempReadOnly\0HonorZeroWrites\0"
                                           "HostIPStack\0");
         }
@@ -921 +921 @@
         if (pCurNode == pCfgHandle)
         {
-            rc = CFGMR3QueryBool(pCurNode, "HostIPStack", &fHostIP);
-            if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-            {
-                fHostIP = true;
-                rc = VINF_SUCCESS;
-            }
-            else if (RT_FAILURE(rc))
+            rc = CFGMR3QueryBoolDef(pCurNode, "HostIPStack", &fHostIP, true);
+            if (RT_FAILURE(rc))
             {
                 rc = PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -934 +929 @@
             }
 
-            rc = CFGMR3QueryBool(pCurNode, "HonorZeroWrites", &fHonorZeroWrites);
-            if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-            {
-                fHonorZeroWrites = false;
-                rc = VINF_SUCCESS;
-            }
-            else if (RT_FAILURE(rc))
+            rc = CFGMR3QueryBoolDef(pCurNode, "HonorZeroWrites", &fHonorZeroWrites, false);
+            if (RT_FAILURE(rc))
             {
                 rc = PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -947 +937 @@
             }
 
-            rc = CFGMR3QueryBool(pCurNode, "ReadOnly", &fReadOnly);
-            if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-            {
-                fReadOnly = false;
-                rc = VINF_SUCCESS;
-            }
-            else if (RT_FAILURE(rc))
+            rc = CFGMR3QueryBoolDef(pCurNode, "ReadOnly", &fReadOnly, false);
+            if (RT_FAILURE(rc))
             {
                 rc = PDMDRV_SET_ERROR(pDrvIns, rc,
                                       N_("DrvVD: Configuration error: Querying \"ReadOnly\" as boolean failed"));
+                break;
+            }
+
+            rc = CFGMR3QueryBoolDef(pCurNode, "TempReadOnly", &pThis->fTempReadOnly, false);
+            if (RT_FAILURE(rc))
+            {
+                rc = PDMDRV_SET_ERROR(pDrvIns, rc,
+                                      N_("DrvVD: Configuration error: Querying \"TempReadOnly\" as boolean failed"));
+                break;
+            }
+            if (fReadOnly && pThis->fTempReadOnly)
+            {
+                rc = PDMDRV_SET_ERROR(pDrvIns, rc,
+                                      N_("DrvVD: Configuration error: Both \"ReadOnly\" and \"TempReadOnly\" are set"));
                 break;
             }
@@ -1058 +1057 @@
          */
         unsigned uOpenFlags;
-        if (fReadOnly || iLevel != 0)
+        if (fReadOnly || pThis->fTempReadOnly || iLevel != 0)
             uOpenFlags = VD_OPEN_FLAGS_READONLY;
         else
@@ -1067 +1066 @@
             uOpenFlags |= VD_OPEN_FLAGS_ASYNC_IO;
 
-        /* Try to open backend in asyc I/O mode first. */
+        /* Try to open backend in async I/O mode first. */
         rc = VDOpen(pThis->pDisk, pszFormat, pszName, uOpenFlags, pImage->pVDIfsImage);
         if (rc == VERR_NOT_SUPPORTED)
@@ -1084 +1083 @@
             if (   VDIsReadOnly(pThis->pDisk)
                 && !fReadOnly
+                && !pThis->fTempReadOnly
                 && iLevel == 0)
             {
                 rc = PDMDrvHlpVMSetError(pDrvIns, VERR_VD_IMAGE_READ_ONLY, RT_SRC_POS,
-                                         N_("Failed to open image '%s' for writing due to wrong "
-                                            "permissions"), pszName);
+                                         N_("Failed to open image '%s' for writing due to wrong permissions"),
+                                         pszName);
                 break;
             }
@@ -1182 +1182 @@
  * @param   pDrvIns     The driver instance data.
  */
-static DECLCALLBACK(void) drvvdResume(PPDMDRVINS pDrvIns)
+static DECLCALLBACK(void) drvvdResumeOrPowerOn(PPDMDRVINS pDrvIns)
 {
     LogFlow(("%s:\n", __FUNCTION__));
@@ -1211 +1211 @@
     AssertRC(rc);
 }
+
 
 /**
@@ -1238 +1239 @@
     NULL,
     /* pfnPowerOn */
-    NULL,
+    drvvdResumeOrPowerOn,
     /* pfnReset */
     NULL,
@@ -1244 +1245 @@
     drvvdSuspend,
     /* pfnResume */
-    drvvdResume,
+    drvvdResumeOrPowerOn,
     /* pfnAttach */
     NULL,

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1057 +1057 @@
                     {
                         rc = CFGMR3InsertInteger(pCfg, "ReadOnly", 1);                          RC_CHECK();
+                    }
+                    /* Start without exclusive write access to the images. */
+                    /** @todo Live Migration: I don't quite like this, we risk screwing up when
+                     *        we're resuming the VM if some 3rd dude have any of the VDIs open
+                     *        with write sharing denied.  However, if the two VMs are sharing a
+                     *        image it really is necessary....
+                     *
+                     *        So, on the "lock-media" command, the target teleporter should also
+                     *        make DrvVD undo TempReadOnly.  It gets interesting if we fail after
+                     *        that. Grumble. */
+                    else if (pConsole->mMachineState == MachineState_TeleportingIn)
+                    {
+                        rc = CFGMR3InsertInteger(pCfg, "TempReadOnly", 1);                      RC_CHECK();
                     }