Changeset 39519 in vbox

Timestamp:

Dec 2, 2011 9:12:21 PM (13 years ago)

Author:

vboxsync

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

75197

Message:

VD: API to repair corrupted images

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• include/VBox/vd-plugin.h (modified) (1 diff)
• include/VBox/vd.h (modified) (2 diffs)
• src/VBox/Storage/DMG.cpp (modified) (1 diff)
• src/VBox/Storage/ISCSI.cpp (modified) (1 diff)
• src/VBox/Storage/QCOW.cpp (modified) (1 diff)
• src/VBox/Storage/QED.cpp (modified) (1 diff)
• src/VBox/Storage/RAW.cpp (modified) (1 diff)
• src/VBox/Storage/VD.cpp (modified) (2 diffs)
• src/VBox/Storage/VDI.cpp (modified) (1 diff)
• src/VBox/Storage/VHD.cpp (modified) (1 diff)
• src/VBox/Storage/VMDK.cpp (modified) (5 diffs)

trunk/include/VBox/err.h

@@ -1522 +1522 @@
 /** The discard operation is not supported for this image. */
 #define VERR_VD_DISCARD_NOT_SUPPORTED               (-3278)
+/** The image is the correct format but is corrupted. */
+#define VERR_VD_IMAGE_CORRUPTED                     (-3279)
+/** Repairing the image is not supported. */
+#define VERR_VD_IMAGE_REPAIR_NOT_SUPPORTED          (-3280)
+/** Repairing the image is not possible because the corruption is to severe. */
+#define VERR_VD_IMAGE_REPAIR_IMPOSSIBLE             (-3281)
 /** @} */
 

trunk/include/VBox/vd-plugin.h

@@ -634 +634 @@
                                                 unsigned fDiscard));
 
+    /**
+     * Try to repair the given image.
+     *
+     * @returns VBox status code.
+     * @param   pszFilename     Name of the image file.
+     * @param   pVDIfsDisk      Pointer to the per-disk VD interface list.
+     * @param   pVDIfsImage     Pointer to the per-image VD interface list.
+     * @param   fFlags          Combination of the VD_REPAIR_* flags.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnRepair, (const char *pszFilename, PVDINTERFACE pVDIfsDisk,
+                                          PVDINTERFACE pVDIfsImage, uint32_t fFlags));
+
 } VBOXHDDBACKEND;
 

trunk/include/VBox/vd.h

@@ -105 +105 @@
 /** @} */
 
+/** @name VD image repair flags
+ * @{
+ */
+/** Don't repair the image but check what needs to be done. */
+#define VD_REPAIR_DRY_RUN                       RT_BIT_32(0)
+
+/** Mask of all valid repair flags. */
+#define VD_REPAIR_FLAGS_MASK                    (VD_REPAIR_DRY_RUN)
+/** @} */
 
 /**
@@ -1170 +1179 @@
                                        void *pvUser1, void *pvUser);
 
+/**
+ * Tries to repair a corrupted image.
+ *
+ * @return  VBox status code.
+ * @retval  VERR_VD_IMAGE_REPAIR_NOT_SUPPORTED if the backend does not support repairing the image.
+ * @retval  VERR_VD_IMAGE_REPAIR_IMPOSSIBLE if the corruption is to severe to repair the image.
+ * @param   pVDIfsDisk      Pointer to the per-disk VD interface list.
+ * @param   pVDIfsImage     Pointer to the per-image VD interface list.
+ * @param   pszFilename     Name of the image file to repair.
+ * @param   pszFormat       The backend to use.
+ * @param   fFlags          Combination of the VD_REPAIR_* flags.
+ */
+VBOXDDU_DECL(int) VDRepair(PVDINTERFACE pVDIfsDisk, PVDINTERFACE pVDIfsImage,
+                           const char *pszFilename, const char *pszBackend,
+                           uint32_t fFlags);
+
 RT_C_DECLS_END
 

trunk/src/VBox/Storage/DMG.cpp

@@ -2336 +2336 @@
     NULL,
     /* pfnAsyncDiscard */
+    NULL,
+    /* pfnRepair */
     NULL
 };

trunk/src/VBox/Storage/ISCSI.cpp

@@ -5574 +5574 @@
     NULL,
     /* pfnAsyncDiscard */
+    NULL,
+    /* pfnRepair */
     NULL
 };

trunk/src/VBox/Storage/QCOW.cpp

@@ -2856 +2856 @@
     NULL,
     /* pfnAsyncDiscard */
+    NULL,
+    /* pfnRepair */
     NULL
 };

trunk/src/VBox/Storage/QED.cpp

@@ -2923 +2923 @@
     NULL,
     /* pfnAsyncDiscard */
+    NULL,
+    /* pfnRepair */
     NULL
 };

trunk/src/VBox/Storage/RAW.cpp

@@ -1294 +1294 @@
     NULL,
     /* pfnAsyncDiscard */
+    NULL,
+    /* pfnRepair */
     NULL
 };

trunk/src/VBox/Storage/VD.cpp

@@ -4981 +4981 @@
                     ("ppszFormat=%#p\n", ppszFormat),
                     VERR_INVALID_PARAMETER);
-    AssertMsgReturn(VALID_PTR(ppszFormat),
+    AssertMsgReturn(VALID_PTR(penmType),
                     ("penmType=%#p\n", penmType),
                     VERR_INVALID_PARAMETER);
@@ -9322 +9322 @@
 }
 
+VBOXDDU_DECL(int) VDRepair(PVDINTERFACE pVDIfsDisk, PVDINTERFACE pVDIfsImage,
+                           const char *pszFilename, const char *pszBackend,
+                           uint32_t fFlags)
+{
+    int rc = VERR_NOT_SUPPORTED;
+    PCVBOXHDDBACKEND pBackend = NULL;
+    VDINTERFACEIOINT VDIfIoInt;
+    VDINTERFACEIO    VDIfIoFallback;
+    PVDINTERFACEIO   pInterfaceIo;
+
+    LogFlowFunc(("pszFilename=\"%s\"\n", pszFilename));
+    /* Check arguments. */
+    AssertMsgReturn(VALID_PTR(pszFilename) && *pszFilename,
+                    ("pszFilename=%#p \"%s\"\n", pszFilename, pszFilename),
+                    VERR_INVALID_PARAMETER);
+    AssertMsgReturn(VALID_PTR(pszBackend),
+                    ("pszBackend=%#p\n", pszBackend),
+                    VERR_INVALID_PARAMETER);
+    AssertMsgReturn((fFlags & ~VD_REPAIR_FLAGS_MASK) == 0,
+                    ("fFlags=%#x\n", fFlags),
+                    VERR_INVALID_PARAMETER);
+
+    pInterfaceIo = VDIfIoGet(pVDIfsImage);
+    if (!pInterfaceIo)
+    {
+        /*
+         * Caller doesn't provide an I/O interface, create our own using the
+         * native file API.
+         */
+        vdIfIoFallbackCallbacksSetup(&VDIfIoFallback);
+        pInterfaceIo = &VDIfIoFallback;
+    }
+
+    /* Set up the internal I/O interface. */
+    AssertReturn(!VDIfIoIntGet(pVDIfsImage), VERR_INVALID_PARAMETER);
+    VDIfIoInt.pfnOpen                   = vdIOIntOpenLimited;
+    VDIfIoInt.pfnClose                  = vdIOIntCloseLimited;
+    VDIfIoInt.pfnDelete                 = vdIOIntDeleteLimited;
+    VDIfIoInt.pfnMove                   = vdIOIntMoveLimited;
+    VDIfIoInt.pfnGetFreeSpace           = vdIOIntGetFreeSpaceLimited;
+    VDIfIoInt.pfnGetModificationTime    = vdIOIntGetModificationTimeLimited;
+    VDIfIoInt.pfnGetSize                = vdIOIntGetSizeLimited;
+    VDIfIoInt.pfnSetSize                = vdIOIntSetSizeLimited;
+    VDIfIoInt.pfnReadSync               = vdIOIntReadSyncLimited;
+    VDIfIoInt.pfnWriteSync              = vdIOIntWriteSyncLimited;
+    VDIfIoInt.pfnFlushSync              = vdIOIntFlushSyncLimited;
+    VDIfIoInt.pfnReadUserAsync          = NULL;
+    VDIfIoInt.pfnWriteUserAsync         = NULL;
+    VDIfIoInt.pfnReadMetaAsync          = NULL;
+    VDIfIoInt.pfnWriteMetaAsync         = NULL;
+    VDIfIoInt.pfnFlushAsync             = NULL;
+    rc = VDInterfaceAdd(&VDIfIoInt.Core, "VD_IOINT", VDINTERFACETYPE_IOINT,
+                        pInterfaceIo, sizeof(VDINTERFACEIOINT), &pVDIfsImage);
+    AssertRC(rc);
+
+    rc = vdFindBackend(pszBackend, &pBackend);
+    if (RT_SUCCESS(rc))
+    {
+        if (pBackend->pfnRepair)
+            rc = pBackend->pfnRepair(pszFilename, pVDIfsDisk, pVDIfsImage, fFlags);
+        else
+            rc = VERR_VD_IMAGE_REPAIR_NOT_SUPPORTED;
+    }
+
+    LogFlowFunc(("returns %Rrc\n", rc));
+    return rc;
+}
+

trunk/src/VBox/Storage/VDI.cpp

@@ -3180 +3180 @@
     vdiDiscard,
     /* pfnAsyncDiscard */
-    vdiAsyncDiscard
+    vdiAsyncDiscard,
+    /* pfnRepair */
+    NULL
 };

trunk/src/VBox/Storage/VHD.cpp

@@ -3143 +3143 @@
     NULL,
     /* pfnAsyncDiscard */
+    NULL,
+    /* pfnRepair */
     NULL
 };

trunk/src/VBox/Storage/VMDK.cpp

@@ -32 +32 @@
 #include <iprt/zip.h>
 #include <iprt/asm.h>
-
 
 /*******************************************************************************
@@ -5299 +5298 @@
 {
     int rc;
+
+    LogFlowFunc(("pImage=%#p pExtent=%#p uSector=%llu pvBuf=%#p cbRead=%llu\n",
+                 pImage, pExtent, uSector, pvBuf, cbRead));
 
     /* Do not allow to go back. */
@@ -5429 +5431 @@
         /* The next data block we have is not for this area, so just return
          * that there is no data. */
+        LogFlowFunc(("returns VERR_VD_BLOCK_FREE\n"));
         return VERR_VD_BLOCK_FREE;
     }
@@ -5436 +5439 @@
            (uint8_t *)pExtent->pvGrain + VMDK_SECTOR2BYTE(uSectorInGrain),
            cbRead);
+    LogFlowFunc(("returns VINF_SUCCESS\n"));
     return VINF_SUCCESS;
 }
@@ -7198 +7202 @@
     NULL,
     /* pfnAsyncDiscard */
+    NULL,
+    /* pfnRepair */
     NULL
 };