Changeset 11131 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 5, 2008 11:29:58 AM (16 years ago)

Author:

vboxsync

Message:

Improve error handling/diagnostics for raw disk vmdk creation.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp (modified) (21 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp

@@ -744 +744 @@
     bool fRelative = false;
 
+    uint64_t cbSize = 0;
+    PVBOXHDD pDisk = NULL;
+    VBOXHDDRAW RawDescriptor;
+    HOSTPARTITIONS partitions;
+    uint32_t uPartitions = 0;
+
     /* let's have a closer look at the arguments */
     for (int i = 0; i < argc; i++)
@@ -810 +816 @@
     if (VBOX_FAILURE(vrc))
     {
-        RTPrintf("Error opening the raw disk: %Vrc\n", vrc);
-        return vrc;
-    }
-
-    uint64_t cbSize = 0;
+        RTPrintf("Error opening the raw disk '%s': %Vrc\n", rawdisk.raw(), vrc);
+        goto out;
+    }
+
 #ifdef RT_OS_WINDOWS
     /* Windows NT has no IOCTL_DISK_GET_LENGTH_INFORMATION ioctl. This was
@@ -838 +843 @@
         }
         else
-            return VERR_MEDIA_NOT_RECOGNIZED;
+        {
+            RTPrintf("File '%s' is no fixed medium device\n", rawdisk.raw());
+            vrc = VERR_INVALID_PARAMETER;
+            goto out;
+        }
 
         GET_LENGTH_INFORMATION DiskLenInfo;
@@ -851 +860 @@
     }
     else
-        rc = RTErrConvertFromWin32(GetLastError());
+    {
+        vrc = RTErrConvertFromWin32(GetLastError());
+        RTPrintf("Error getting the geometry of the raw disk '%s': %Vrc\n", rawdisk.raw(), vrc);
+        goto out;
+    }
 #elif defined(RT_OS_LINUX)
     struct stat DevStat;
@@ -875 +888 @@
                 cbSize = (uint64_t)cBlocks << 9;
             else
-                return RTErrConvertFromErrno(errno);
+            {
+                vrc = RTErrConvertFromErrno(errno);
+                RTPrintf("Error getting the size of the raw disk '%s': %Vrc\n", rawdisk.raw(), vrc);
+                goto out;
+            }
         }
     }
@@ -881 +898 @@
     {
         RTPrintf("File '%s' is no block device\n", rawdisk.raw());
-        return VERR_INVALID_PARAMETER;
+        vrc = VERR_INVALID_PARAMETER;
+        goto out;
     }
 #elif defined(RT_OS_DARWIN)
@@ -894 +912 @@
                 cbSize = cBlocks * cbBlock;
             else
-                return RTErrConvertFromErrno(errno);
+            {
+                RTPrintf("Cannot get the block size for file '%s': %Vrc", rawdisk.raw(), vrc);
+                vrc = RTErrConvertFromErrno(errno);
+                goto out;
+            }
         }
         else
-            return RTErrConvertFromErrno(errno);
+        {
+            vrc = RTErrConvertFromErrno(errno);
+            RTPrintf("Cannot get the block count for file '%s': %Vrc", rawdisk.raw(), vrc);
+            goto out;
+        }
     }
     else
     {
         RTPrintf("File '%s' is no block device\n", rawdisk.raw());
-        return VERR_INVALID_PARAMETER;
+        vrc = VERR_INVALID_PARAMETER;
+        goto out;
     }
 #elif defined(RT_OS_SOLARIS)
@@ -913 +940 @@
             cbSize = mediainfo.dki_capacity * mediainfo.dki_lbsize;
         else
-            return RTErrConvertFromErrno(errno);
+        {
+            vrc = RTErrConvertFromErrno(errno);
+            RTPrintf("Error getting the size of the raw disk '%s': %Vrc\n", rawdisk.raw(), vrc);
+            goto out;
+        }
     }
     else
     {
         RTPrintf("File '%s' is no block or char device\n", rawdisk.raw());
-        return VERR_INVALID_PARAMETER;
+        vrc = VERR_INVALID_PARAMETER;
+        goto out;
     }
 #else /* all unrecognized OSes */
@@ -926 +958 @@
     if (VBOX_FAILURE(vrc))
     {
-        RTPrintf("Error getting the size of the raw disk: %Vrc\n", vrc);
-        return vrc;
+        RTPrintf("Error getting the size of the raw disk '%s': %Vrc\n", rawdisk.raw(), vrc);
+        goto out;
     }
 #endif
@@ -935 +967 @@
     {
         RTPrintf("Detected size of raw disk '%s' is %s, an invalid value\n", rawdisk.raw(), cbSize);
-        return VERR_INVALID_PARAMETER;
-    }
-
-    PVBOXHDD pDisk = NULL;
-    VBOXHDDRAW RawDescriptor;
-    HOSTPARTITIONS partitions;
-    uint32_t uPartitions = 0;
+        vrc = VERR_INVALID_PARAMETER;
+        goto out;
+    }
 
     RawDescriptor.szSignature[0] = 'R';
@@ -967 +995 @@
             {
                 RTPrintf("Incorrect value in partitions parameter\n");
-                return vrc;
+                goto out;
             }
             uPartitions |= RT_BIT(u32);
@@ -976 +1004 @@
             {
                 RTPrintf("Incorrect separator in partitions parameter\n");
-                return VERR_INVALID_PARAMETER;
+                vrc = VERR_INVALID_PARAMETER;
+                goto out;
             }
         }
@@ -984 +1013 @@
         {
             RTPrintf("Error reading the partition information from '%s'\n", rawdisk.raw());
-            return vrc;
+            goto out;
         }
 
@@ -1006 +1035 @@
         RawDescriptor.pPartitions = (PVBOXHDDRAWPART)RTMemAllocZ(partitions.cPartitions * sizeof(VBOXHDDRAWPART));
         if (!RawDescriptor.pPartitions)
-            return VERR_NO_MEMORY;
+        {
+            RTPrintf("Out of memory allocating the partition list for '%s'\n", rawdisk.raw());
+            vrc = VERR_NO_MEMORY;
+            goto out;
+        }
         for (unsigned i = 0; i < partitions.cPartitions; i++)
         {
@@ -1022 +1055 @@
                         RTPrintf("Error creating reference to individual partition %u, rc=%Vrc\n",
                                  partitions.aPartitions[i].uIndex, vrc);
-                        return vrc;
+                        goto out;
                     }
                     RawDescriptor.pPartitions[i].pszRawDevice = pszRawName;
@@ -1073 +1106 @@
                 void *pPartData = RTMemAlloc((size_t)RawDescriptor.pPartitions[i].cbPartitionData);
                 if (!pPartData)
-                    return VERR_NO_MEMORY;
+                {
+                    RTPrintf("Out of memory allocating the partition descriptor for '%s'\n", rawdisk.raw());
+                    vrc = VERR_NO_MEMORY;
+                    goto out;
+                }
                 vrc = RTFileReadAt(RawFile, partitions.aPartitions[i].uPartDataStart * 512, pPartData, (size_t)RawDescriptor.pPartitions[i].cbPartitionData, NULL);
                 if (VBOX_FAILURE(vrc))
                 {
                     RTPrintf("Cannot read partition data from raw device '%s': %Vrc\n", rawdisk.raw(), vrc);
-                    return vrc;
+                    goto out;
                 }
                 /* Splice in the replacement MBR code if specified. */
@@ -1089 +1126 @@
                     {
                         RTPrintf("Cannot open replacement MBR file '%s' specified with -mbr: %Vrc\n", pszMBRFilename, vrc);
-                        return vrc;
+                        goto out;
                     }
                     vrc = RTFileReadAt(MBRFile, 0, pPartData, 0x1be, NULL);
@@ -1096 +1133 @@
                     {
                         RTPrintf("Cannot read replacement MBR file '%s': %Vrc\n", pszMBRFilename, vrc);
-                        return vrc;
+                        goto out;
                     }
                 }
@@ -1120 +1157 @@
     {
         RTPrintf("Error while creating the virtual disk container: %Vrc\n", vrc);
-        return vrc;
+        goto out;
     }
 
@@ -1139 +1176 @@
     {
         RTPrintf("Error while creating the raw disk VMDK: %Vrc\n", vrc);
-        return vrc;
+        goto out;
     }
     RTPrintf("RAW host disk access VMDK file %s created successfully.\n", Utf8Str(filename).raw());
@@ -1175 +1212 @@
 
     return SUCCEEDED(rc) ? 0 : 1;
+
+out:
+    RTPrintf("The raw disk vmdk file was not created\n");
+    return VBOX_SUCCESS(vrc) ? 0 : 1;
 }