Changeset 32536 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Sep 15, 2010 6:25:32 PM (15 years ago)

Author:

vboxsync

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

65918

Message:

Storage/VBoxHDD: replace custom open flags with regular IPRT file open flags, introduce user-providable filesystem access interface, eliminate dependency on PGM geometry structure, change pvBuffer/cbBuffer parameter ordering to the usual conventions, eliminate the remains of the old I/O code, make more plugin methods optional to reduce redundancy, lots of cleanups

Storage/DrvVD+testcases,Main/Medium+Frontends: adapt to VBoxHDD changes, logging fixes

Storage/VDI+VMDK+DMG+Raw+VHD+Parallels+VCI: made as similar to each other as possible, added inline VFS wrappers to improve readability, full VFS support, VDI files are now 4K aligned, eliminate the remains of the old I/O code, various more or less severe bugfixes, code sort

Storage/iSCSI: support disks bigger than 2T, streamline the code to be more similar to the file-based backends, memory leak fix, error code usage like file-based backends, code sort

log+err: added new error codes/log groups and eliminated unused old ones

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxInternalManage.cpp (modified) (6 diffs)
• VBoxManageDisk.cpp (modified) (1 diff)

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

@@ -508 +508 @@
 }
 
-static int handleVDMessage(void *pvUser, const char *pszFormat, ...)
+static int handleVDMessage(void *pvUser, const char *pszFormat, va_list va)
 {
     NOREF(pvUser);
-    va_list args;
-    va_start(args, pszFormat);
-    int rc = RTPrintfV(pszFormat, args);
-    va_end(args);
-    return rc;
+    return RTPrintfV(pszFormat, va);
 }
 
@@ -555 +551 @@
     /* just try it */
     char *pszFormat = NULL;
-    int rc = VDGetFormat(NULL /* pVDIfsDisk */, argv[1], &pszFormat);
+    int rc = VDGetFormat(NULL /* pVDIfsDisk */, NULL /* pVDIfsImage */,
+                         argv[1], &pszFormat);
     if (RT_FAILURE(rc))
     {
@@ -616 +613 @@
     /* just try it */
     char *pszFormat = NULL;
-    int rc = VDGetFormat(NULL /* pVDIfsDisk */, argv[0], &pszFormat);
+    int rc = VDGetFormat(NULL /* pVDIfsDisk */, NULL /* pVDIfsImage */,
+                         argv[0], &pszFormat);
     if (RT_FAILURE(rc))
     {
@@ -1437 +1435 @@
     Assert(RT_MIN(cbSize / 512 / 16 / 63, 16383) -
            (unsigned int)RT_MIN(cbSize / 512 / 16 / 63, 16383) == 0);
-    PDMMEDIAGEOMETRY PCHS, LCHS;
+    VDGEOMETRY PCHS, LCHS;
     PCHS.cCylinders = (unsigned int)RT_MIN(cbSize / 512 / 16 / 63, 16383);
     PCHS.cHeads = 16;
@@ -1641 +1639 @@
     {
         char *pszFormat = NULL;
-        vrc = VDGetFormat(NULL /* pVDIfsDisk */, src.c_str(), &pszFormat);
+        vrc = VDGetFormat(NULL /* pVDIfsDisk */, NULL /* pVDIfsImage */,
+                          src.c_str(), &pszFormat);
         if (RT_FAILURE(vrc))
         {
@@ -1788 +1787 @@
         {
             char *pszFormat = NULL;
-            vrc = VDGetFormat(NULL /* pVDIfsDisk */, src.c_str(), &pszFormat);
+            vrc = VDGetFormat(NULL /* pVDIfsDisk */, NULL /* pVDIfsImage */,
+                              src.c_str(), &pszFormat);
             if (RT_FAILURE(vrc))
             {

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

@@ -890 +890 @@
     Assert(RT_MIN(cbFile / 512 / 16 / 63, 16383) -
            (unsigned int)RT_MIN(cbFile / 512 / 16 / 63, 16383) == 0);
-    PDMMEDIAGEOMETRY PCHS, LCHS;
+    VDGEOMETRY PCHS, LCHS;
     PCHS.cCylinders = (unsigned int)RT_MIN(cbFile / 512 / 16 / 63, 16383);
     PCHS.cHeads = 16;