Changeset 18127 in vbox for trunk/src

Timestamp:

Mar 23, 2009 9:20:31 AM (16 years ago)

Author:

vboxsync

Message:

DrvVD: fail if a VD image was forced to be opened in read-only mode

Location:

trunk/src/VBox/Devices/Storage

Files:

• DrvBlock.cpp (modified) (1 diff)
• DrvVD.cpp (modified) (1 diff)

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

@@ -873 +873 @@
     if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
-                                   N_("Failed to attach driver below us! rc=%Rra\n"), rc);
+                                   N_("Failed to attach driver below us! %Rrf"), rc);
 
     pThis->pDrvMedia = (PPDMIMEDIA)pBase->pfnQueryInterface(pBase, PDMINTERFACE_MEDIA);

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

@@ -1010 +1010 @@
 
         if (RT_SUCCESS(rc))
+        {
             Log(("%s: %d - Opened '%s' in %s mode\n", __FUNCTION__,
                  iLevel, pszName,
                  VDIsReadOnly(pThis->pDisk) ? "read-only" : "read-write"));
+            if (   VDIsReadOnly(pThis->pDisk)
+                && !fReadOnly)
+            {
+                rc = PDMDrvHlpVMSetError(pDrvIns, VERR_VD_IMAGE_READ_ONLY, RT_SRC_POS,
+                                         N_("Failed to open image '%s' for writing due to wrong "
+                                            "permissions"), pszName);
+                break;
+            }
+        }
         else
         {
            rc = PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
-                                    N_("Failed to open image '%s' in %s mode rc=%Rrc\n"), pszName,
+                                    N_("Failed to open image '%s' in %s mode rc=%Rrc"), pszName,
                                     (uOpenFlags & VD_OPEN_FLAGS_READONLY) ? "readonly" : "read-write", rc);
            break;