Changeset 31185 in vbox

Timestamp:

Jul 28, 2010 8:40:14 PM (14 years ago)

Author:

vboxsync

Message:

VBoxHDD: Add a flag to disable locking of an image file

Location:

trunk

Files:

• include/VBox/VBoxHDD.h (modified) (1 diff)
• src/VBox/Devices/Storage/DrvVD.cpp (modified) (1 diff)
• src/VBox/Devices/Storage/VBoxHDD.cpp (modified) (2 diffs)
• src/VBox/Devices/Storage/VDIHDDCore.cpp (modified) (1 diff)
• src/VBox/Devices/Storage/VHDHDDCore.cpp (modified) (1 diff)
• src/VBox/Devices/Storage/VmdkHDDCore.cpp (modified) (4 diffs)

trunk/include/VBox/VBoxHDD.h

@@ -467 +467 @@
 
 /** Open the storage readonly. */
-#define VD_INTERFACEASYNCIO_OPEN_FLAGS_READONLY RT_BIT(0)
+#define VD_INTERFACEASYNCIO_OPEN_FLAGS_READONLY  RT_BIT(0)
 /** Create the storage backend if it doesn't exist. */
-#define VD_INTERFACEASYNCIO_OPEN_FLAGS_CREATE RT_BIT(1)
+#define VD_INTERFACEASYNCIO_OPEN_FLAGS_CREATE    RT_BIT(1)
+/** Don't write lock the opened file. */
+#define VD_INTERFACEASYNCIO_OPEN_FLAGS_DONT_LOCK RT_BIT(2)
 
 /**

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

@@ -348 +348 @@
                                    : 0;
                 if (pThis->fShareable)
+                {
+                    Assert(fFlags & VD_INTERFACEASYNCIO_OPEN_FLAGS_DONT_LOCK);
+
                     fFlags |= PDMACEP_FILE_FLAGS_DONT_LOCK;
+                }
                 else
                     fFlags |= PDMACEP_FILE_FLAGS_CACHING;

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

@@ -1612 +1612 @@
                 /* Set the state to growing. */
                 LogFlowFunc(("Disk is growing because of pIoCtx=%#p pIoCtxWrite=%#p\n",
+
                              pIoCtx, pIoCtxWrite));
                 ASMAtomicWriteBool(&pDisk->fGrowing, true);
@@ -1824 +1825 @@
 
     if (uOpenFlags & VD_INTERFACEASYNCIO_OPEN_FLAGS_READONLY)
-        fOpen |= RTFILE_O_READ      | RTFILE_O_DENY_NONE;
+        fOpen |= RTFILE_O_READ | RTFILE_O_DENY_NONE;
     else
-        fOpen |= RTFILE_O_READWRITE | RTFILE_O_DENY_WRITE;
+    {
+        fOpen |= RTFILE_O_READWRITE;
+
+        if (uOpenFlags & VD_INTERFACEASYNCIO_OPEN_FLAGS_DONT_LOCK)
+            fOpen |= RTFILE_O_DENY_NONE;
+        else
+            fOpen |= RTFILE_O_DENY_WRITE;
+    }
 
     if (uOpenFlags & VD_INTERFACEASYNCIO_OPEN_FLAGS_CREATE)

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

@@ -102 +102 @@
     if (fCreate)
         uOpenFlags |= VD_INTERFACEASYNCIO_OPEN_FLAGS_CREATE;
+
+    if (fShareable)
+        uOpenFlags |= VD_INTERFACEASYNCIO_OPEN_FLAGS_DONT_LOCK;
 
     rc = pImage->pInterfaceIOCallbacks->pfnOpen(pImage->pInterfaceIO->pvUser,

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

@@ -284 +284 @@
     if (fCreate)
         uOpenFlags |= VD_INTERFACEASYNCIO_OPEN_FLAGS_CREATE;
+
+    if (fShareable)
+        uOpenFlags |= VD_INTERFACEASYNCIO_OPEN_FLAGS_DONT_LOCK;
 
     rc = pImage->pInterfaceIOCallbacks->pfnOpen(pImage->pInterfaceIO->pvUser,

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

@@ -628 +628 @@
     if ((fOpen & RTFILE_O_ACTION_MASK) == RTFILE_O_CREATE)
         uOpenFlags |= VD_INTERFACEASYNCIO_OPEN_FLAGS_CREATE;
+    if ((fOpen & RTFILE_O_DENY_MASK) == RTFILE_O_DENY_NONE)
+        uOpenFlags |= VD_INTERFACEASYNCIO_OPEN_FLAGS_DONT_LOCK;
 
     rc = pImage->pInterfaceIOCallbacks->pfnOpen(pImage->pInterfaceIO->pvUser,
@@ -2057 +2059 @@
     rc = vmdkDescDDBSetU32(pImage, &pImage->Descriptor,
                            VMDK_DDB_GEO_LCHS_HEADS,
+
                            pLCHSGeometry->cHeads);
     if (RT_FAILURE(rc))
@@ -2257 +2260 @@
         else
             return vmdkError(pImage, VERR_VD_VMDK_INVALID_HEADER, RT_SRC_POS, N_("VMDK: parse error in extent description in '%s'"), pImage->pszFilename);
+
         if (pImage->pExtents[i].enmType == VMDKETYPE_ZERO)
         {
@@ -4066 +4070 @@
 
     if (RT_FAILURE(rc))
+
         goto out;