Changeset 124 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Jan 17, 2007 5:38:24 PM (18 years ago)

Author:

vboxsync

Message:

LogRel() on VDI failure, make them visible on vditool.

Location:

trunk/src/VBox/Devices/Storage

Files:

• VBoxHDD.cpp (modified) (3 diffs)
• testcase/vhddtool.cpp (modified) (13 diffs)

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

@@ -711 +711 @@
 
             if (pHeader->u.v1.cbHeader < sizeof(VDIHEADER1))
+            {
+                LogRel(("VDI: v1 header size wrong (%d < %d)\n",
+                       pHeader->u.v1.cbHeader, sizeof(VDIHEADER1)));
                 return VERR_VDI_INVALID_HEADER;
+            }
 
             if (getImageBlocksOffset(pHeader) < (sizeof(VDIPREHEADER) + sizeof(VDIHEADER1)))
+            {
+                LogRel(("VDI: v1 blocks offset wrong (%d < %d)\n",
+                       getImageBlocksOffset(pHeader), sizeof(VDIPREHEADER) + sizeof(VDIHEADER1)));
                 return VERR_VDI_INVALID_HEADER;
+            }
 
             if (getImageDataOffset(pHeader) < (getImageBlocksOffset(pHeader) + getImageBlocks(pHeader) * sizeof(VDIIMAGEBLOCKPOINTER)))
+            {
+                LogRel(("VDI: v1 image data offset wrong (%d < %d)\n",
+                       getImageDataOffset(pHeader), getImageBlocksOffset(pHeader) + getImageBlocks(pHeader) * sizeof(VDIIMAGEBLOCKPOINTER)));
                 return VERR_VDI_INVALID_HEADER;
+            }
 
             if (    getImageType(pHeader) == VDI_IMAGE_TYPE_UNDO
@@ -723 +735 @@
             {
                 if (RTUuidIsNull(getImageParentUUID(pHeader)))
+                {
+                    LogRel(("VDI: v1 uuid of parent is 0)\n"));
                     return VERR_VDI_INVALID_HEADER;
+                }
                 if (RTUuidIsNull(getImageParentModificationUUID(pHeader)))
+                {
+                    LogRel(("VDI: v1 uuid of parent modification is 0\n"));
                     return VERR_VDI_INVALID_HEADER;
+                }
             }
 
@@ -745 +763 @@
 
     if ((getImageGeometry(pHeader))->cbSector != VDI_GEOMETRY_SECTOR_SIZE)
+    {
+        LogRel(("VDI: wrong section size (%d != %d)\n",
+               (getImageGeometry(pHeader))->cbSector, VDI_GEOMETRY_SECTOR_SIZE));
         return VERR_VDI_INVALID_HEADER;
+    }
 
     if (    getImageDiskSize(pHeader) == 0
         ||  getImageBlockSize(pHeader) == 0
         ||  getImageBlocks(pHeader) == 0
-        ||  getPowerOfTwo(getImageBlockSize(pHeader)) == 0
-        ||  getImageBlocksAllocated(pHeader) > getImageBlocks(pHeader))
+        ||  getPowerOfTwo(getImageBlockSize(pHeader)) == 0)
+    {
+        LogRel(("VDI: wrong size (%lld, %d, %d, %d)\n",
+              getImageDiskSize(pHeader), getImageBlockSize(pHeader),
+              getImageBlocks(pHeader), getPowerOfTwo(getImageBlockSize(pHeader))));
         return VERR_VDI_INVALID_HEADER;
+    }
+
+    if (getImageBlocksAllocated(pHeader) > getImageBlocks(pHeader))
+    {
+        LogRel(("VDI: too many blocks allocated (%d > %d)\n"
+                "     blocksize=%d disksize=%lld\n",
+              getImageBlocksAllocated(pHeader), getImageBlocks(pHeader),
+              getImageBlockSize(pHeader), getImageDiskSize(pHeader)));
+        return VERR_VDI_INVALID_HEADER;
+    }
 
     if (    getImageExtraBlockSize(pHeader) != 0
         &&  getPowerOfTwo(getImageExtraBlockSize(pHeader)) == 0)
+    {
+        LogRel(("VDI: wrong extra size (%d, %d)\n",
+               getImageExtraBlockSize(pHeader), getPowerOfTwo(getImageExtraBlockSize(pHeader))));
         return VERR_VDI_INVALID_HEADER;
+    }
 
     if ( (uint64_t)getImageBlockSize(pHeader) * getImageBlocks(pHeader) < getImageDiskSize(pHeader))
+    {
+        LogRel(("VDI: wrong disk size (%d, %d, %lld)\n",
+               getImageBlockSize(pHeader),
+               getImageBlocks(pHeader),
+               getImageDiskSize(pHeader)));
         return VERR_VDI_INVALID_HEADER;
+    }
 
     if (RTUuidIsNull(getImageCreationUUID(pHeader)))
+    {
+        LogRel(("VDI: uuid of creator is 0\n"));
         return VERR_VDI_INVALID_HEADER;
+    }
     if (RTUuidIsNull(getImageModificationUUID(pHeader)))
+    {
+        LogRel(("VDI: uuid of modificator is 0\n"));
         return VERR_VDI_INVALID_HEADER;
+    }
 
     return VINF_SUCCESS;

trunk/src/VBox/Devices/Storage/testcase/vhddtool.cpp

@@ -74 +74 @@
         RTPrintf("The operation completed successfully! (rc=%Rrc)\n", rc);
     else
-        RTPrintf("failure: %Rrf (%Rrc)\n", rc, rc);
+        RTPrintf("FAILURE: %Rrf (%Rrc)\n", rc, rc);
     return rc;
 }
@@ -80 +80 @@
 static int NewImage(const char *pszFilename, uint32_t cMBs)
 {
-    RTPrintf("creating VDI: file=\"%s\" size=%u MB...\n",
+    RTPrintf("Creating VDI: file=\"%s\" size=%u MB...\n",
              pszFilename, cMBs);
     int rc = VDICreateBaseImage(pszFilename,
@@ -91 +91 @@
 static int ConvertDDImage(const char *pszFilename, const char *pszDDFilename)
 {
-    RTPrintf("converting VDI: from DD image file=\"%s\" to file=\"%s\"...\n",
+    RTPrintf("Converting VDI: from DD image file=\"%s\" to file=\"%s\"...\n",
              pszDDFilename, pszFilename);
 
@@ -108 +108 @@
     if (VBOX_SUCCESS(rc))
     {
-        RTPrintf("creating fixed image with size %u Bytes...\n", (unsigned)cbFile);
+        RTPrintf("Creating fixed image with size %u Bytes...\n", (unsigned)cbFile);
         rc = VDICreateBaseImage(pszFilename,
                                 VDI_IMAGE_TYPE_FIXED,
@@ -116 +116 @@
         if (VBOX_SUCCESS(rc))
         {
-            RTPrintf("writing data...\n");
+            RTPrintf("Writing data...\n");
             PVDIDISK pVdi = VDIDiskCreate();
             rc = VDIDiskOpenImage(pVdi, pszFilename, VDI_OPEN_FLAGS_NORMAL);
@@ -177 +177 @@
 static int ConvertOldImage(const char *pszFilename)
 {
-    RTPrintf("converting VDI image file=\"%s\" to a new format...\n"
+    RTPrintf("Converting VDI image file=\"%s\" to a new format...\n"
              "progress: 0%%",
              pszFilename);
@@ -188 +188 @@
 static int DumpImage(const char *pszFilename)
 {
-    RTPrintf("dumping VDI image file=\"%s\" into the log file...\n", pszFilename);
+    RTPrintf("Dumping VDI image file=\"%s\" into the log file...\n", pszFilename);
     PVDIDISK pVdi = VDIDiskCreate();
     int rc = VDIDiskOpenImage(pVdi, pszFilename, VDI_OPEN_FLAGS_READONLY);
@@ -201 +201 @@
 static int ResetImageGeometry(const char *pszFilename)
 {
-    RTPrintf("resetting geometry info of VDI image file=\"%s\"\n", pszFilename);
+    RTPrintf("Resetting geometry info of VDI image file=\"%s\"\n", pszFilename);
     PVDIDISK pVdi = VDIDiskCreate();
     int rc = VDIDiskOpenImage(pVdi, pszFilename, VDI_OPEN_FLAGS_NORMAL);
@@ -216 +216 @@
 static int CopyImage(const char *pszDstFile, const char *pszSrcFile)
 {
-    RTPrintf("copying VDI image file=\"%s\" to image file=\"%s\"...\n"
+    RTPrintf("Copying VDI image file=\"%s\" to image file=\"%s\"...\n"
              "progress: 0%%",
              pszSrcFile, pszDstFile);
@@ -227 +227 @@
 static int CopyToDD(const char *pszDstFile, const char *pszSrcFile)
 {
-    RTPrintf("copying VDI image file=\"%s\" to DD file=\"%s\"...\n",
+    RTPrintf("Copying VDI image file=\"%s\" to DD file=\"%s\"...\n",
              pszSrcFile, pszDstFile);
     PVDIDISK pVdi = VDIDiskCreate();
@@ -264 +264 @@
 static int ShrinkImage(const char *pszFilename)
 {
-    RTPrintf("shrinking VDI image file=\"%s\"...\n"
+    RTPrintf("Shrinking VDI image file=\"%s\"...\n"
              "progress: 0%%",
              pszFilename);
@@ -290 +290 @@
     ascii2upper(szCmd);
 
-    int rc;
+    PRTLOGGER pLogger;
+    static const char * const s_apszGroups[] = VBOX_LOGGROUP_NAMES;
+    int rc = RTLogCreate(&pLogger, 0, "all",
+                         NULL, ELEMENTS(s_apszGroups), s_apszGroups,
+                          RTLOGDEST_STDOUT, NULL);
+    RTLogRelSetDefaultInstance(pLogger);
+
     if (strcmp(szCmd, "NEW") == 0)
     {
@@ -355 +361 @@
         return SyntaxError("Invalid command!");
 
+    RTLogFlush(NULL);
     return !VBOX_SUCCESS(rc);
 }