Changeset 32536 in vbox for trunk/src/VBox/Devices/Storage/testcase

Timestamp:

Sep 15, 2010 6:25:32 PM (14 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/Devices/Storage/testcase

Files:

• Makefile.kmk (modified) (1 diff)
• tstVD.cpp (modified) (7 diffs)
• tstVDCopy.cpp (modified) (1 diff)
• tstVDShareable.cpp (modified) (2 diffs)
• tstVDSnap.cpp (modified) (2 diffs)
• vbox-img.cpp (modified) (6 diffs)
• vditool.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Storage/testcase/Makefile.kmk

@@ -96 +96 @@
         $(VBOX_PATH_DEVICES_SRC)/Storage/ParallelsHDDCore.cpp \
         $(VBOX_PATH_DEVICES_SRC)/Storage/DMGHDDCore.cpp
- ifdef VBOX_WITH_NEW_IO_CODE
- vbox-img_DEFS += VBOX_WITH_NEW_IO_CODE
- endif
  vbox-img_DEFS += VBOX_HDD_NO_DYNAMIC_BACKENDS IN_VBOXDDU IN_VBOXDDU_STATIC IN_RT_R3
 endif

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -53 +53 @@
 }
 
-static int tstVDMessage(void *pvUser, const char *pszFormat, ...)
-{
-    va_list va;
-
+static int tstVDMessage(void *pvUser, const char *pszFormat, va_list va)
+{
     RTPrintf("tstVD: ");
-    va_start(va, pszFormat);
     RTPrintfV(pszFormat, va);
-    va_end(va);
     return VINF_SUCCESS;
 }
@@ -69 +65 @@
     int rc;
     PVBOXHDD pVD = NULL;
-    PDMMEDIAGEOMETRY PCHS = { 0, 0, 0 };
-    PDMMEDIAGEOMETRY LCHS = { 0, 0, 0 };
+    VDGEOMETRY       PCHS = { 0, 0, 0 };
+    VDGEOMETRY       LCHS = { 0, 0, 0 };
     PVDINTERFACE     pVDIfs = NULL;
     VDINTERFACE      VDIError;
@@ -127 +123 @@
     int rc;
     PVBOXHDD pVD = NULL;
-    PDMMEDIAGEOMETRY PCHS = { 0, 0, 0 };
-    PDMMEDIAGEOMETRY LCHS = { 0, 0, 0 };
+    VDGEOMETRY       PCHS = { 0, 0, 0 };
+    VDGEOMETRY       LCHS = { 0, 0, 0 };
     PVDINTERFACE     pVDIfs = NULL;
     VDINTERFACE      VDIError;
@@ -509 +505 @@
     PVBOXHDD pVD = NULL;
     char *pszFormat;
-    PDMMEDIAGEOMETRY PCHS = { 0, 0, 0 };
-    PDMMEDIAGEOMETRY LCHS = { 0, 0, 0 };
-    uint64_t u64DiskSize  = 1000 * _1M;
+    VDGEOMETRY PCHS = { 0, 0, 0 };
+    VDGEOMETRY LCHS = { 0, 0, 0 };
+    uint64_t u64DiskSize = 1000 * _1M;
     uint32_t u32SectorSize = 512;
     PVDINTERFACE     pVDIfs = NULL;
@@ -551 +547 @@
     {
         RTFileClose(File);
-        rc = VDGetFormat(NULL, pszBaseFilename, &pszFormat);
+        rc = VDGetFormat(NULL /* pVDIfsDisk */, NULL /* pVDIfsImage */,
+                         pszBaseFilename, &pszFormat);
         RTPrintf("VDGetFormat() pszFormat=%s rc=%Rrc\n", pszFormat, rc);
         if (RT_SUCCESS(rc) && strcmp(pszFormat, pszBackend))
@@ -633 +630 @@
     int rc;
     PVBOXHDD pVD = NULL;
-    PDMMEDIAGEOMETRY PCHS = { 0, 0, 0 };
-    PDMMEDIAGEOMETRY LCHS = { 0, 0, 0 };
-    uint64_t u64DiskSize  = 1000 * _1M;
+    VDGEOMETRY PCHS = { 0, 0, 0 };
+    VDGEOMETRY LCHS = { 0, 0, 0 };
+    uint64_t u64DiskSize = 1000 * _1M;
     uint32_t u32SectorSize = 512;
     PVDINTERFACE     pVDIfs = NULL;

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

@@ -97 +97 @@
     AssertRC(rc);
 
-    rc = VDGetFormat(NULL, argv[1], &pszVD1);
+    rc = VDGetFormat(NULL /* pVDIfsDisk */, NULL /* pVDIfsImage */,
+                     argv[1], &pszVD1);
     CHECK("VDGetFormat() hdd1");
 
-    rc = VDGetFormat(NULL, argv[2], &pszVD2);
+    rc = VDGetFormat(NULL /* pVDIfsDisk */, NULL /* pVDIfsImage */,
+                     argv[2], &pszVD2);
     CHECK("VDGetFormat() hdd2");
 

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

@@ -53 +53 @@
 }
 
-static int tstVDMessage(void *pvUser, const char *pszFormat, ...)
+static int tstVDMessage(void *pvUser, const char *pszFormat, va_list va)
 {
-    va_list va;
-
     RTPrintf("tstVD: ");
-    va_start(va, pszFormat);
     RTPrintfV(pszFormat, va);
-    va_end(va);
     return VINF_SUCCESS;
 }
@@ -69 +65 @@
     int rc;
     PVBOXHDD pVD = NULL, pVD2 = NULL;
-    PDMMEDIAGEOMETRY PCHS = { 0, 0, 0 };
-    PDMMEDIAGEOMETRY LCHS = { 0, 0, 0 };
+    VDGEOMETRY       PCHS = { 0, 0, 0 };
+    VDGEOMETRY       LCHS = { 0, 0, 0 };
     PVDINTERFACE     pVDIfs = NULL;
     VDINTERFACE      VDIError;

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

@@ -92 +92 @@
 }
 
-static int tstVDMessage(void *pvUser, const char *pszFormat, ...)
-{
-    va_list va;
-
+static int tstVDMessage(void *pvUser, const char *pszFormat, va_list va)
+{
     RTPrintf("tstVD: ");
-    va_start(va, pszFormat);
     RTPrintfV(pszFormat, va);
-    va_end(va);
     return VINF_SUCCESS;
 }
@@ -220 +216 @@
     int rc;
     PVBOXHDD pVD = NULL;
-    PDMMEDIAGEOMETRY PCHS = { 0, 0, 0 };
-    PDMMEDIAGEOMETRY LCHS = { 0, 0, 0 };
+    VDGEOMETRY       PCHS = { 0, 0, 0 };
+    VDGEOMETRY       LCHS = { 0, 0, 0 };
     PVDINTERFACE     pVDIfs = NULL;
     VDINTERFACE      VDIError;

trunk/src/VBox/Devices/Storage/testcase/vbox-img.cpp

@@ -72 +72 @@
 }
 
-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);
-    RTPrintfV(pszFormat, args);
-    va_end(args);
+    RTPrintfV(pszFormat, va);
     return VINF_SUCCESS;
 }
@@ -177 +174 @@
         /* Don't pass error interface, as that would triggers error messages
          * because some backends fail to open the image. */
-        rc = VDGetFormat(NULL, pszFilename, &pszFormat);
+        rc = VDGetFormat(NULL, NULL, pszFilename, &pszFormat);
         if (RT_FAILURE(rc))
             return errorRuntime("Format autodetect failed: %Rrc\n", rc);
@@ -246 +243 @@
     const char *pszDstFilename = NULL;
     char *pszSrcFormat = NULL;
-    char *pszDstFormat = NULL;
+    const char *pszDstFormat = NULL;
     const char *pszVariant = NULL;
     PVBOXHDD pSrcDisk = NULL;
@@ -338 +335 @@
         if (!pszSrcFormat)
         {
-            rc = VDGetFormat(NULL, pszSrcFilename, &pszSrcFormat);
+            rc = VDGetFormat(NULL, NULL, pszSrcFilename, &pszSrcFormat);
             if (RT_FAILURE(rc))
             {
@@ -431 +428 @@
     /* just try it */
     char *pszFormat = NULL;
-    rc = VDGetFormat(NULL, pszFilename, &pszFormat);
+    rc = VDGetFormat(NULL, NULL, pszFilename, &pszFormat);
     if (RT_FAILURE(rc))
         return errorSyntax("Format autodetect failed: %Rrc\n", rc);
@@ -487 +484 @@
     /* just try it */
     char *pszFormat = NULL;
-    rc = VDGetFormat(NULL, pszFilename, &pszFormat);
+    rc = VDGetFormat(NULL, NULL, pszFilename, &pszFormat);
     if (RT_FAILURE(rc))
         return errorSyntax("Format autodetect failed: %Rrc\n", rc);

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -108 +108 @@
         return PrintDone(rc);
 
-    PDMMEDIAGEOMETRY geo = { 0, 0, 0 }; /* auto-detect */
+    VDGEOMETRY geo = { 0, 0, 0 }; /* auto-detect */
     rc = VDCreateBase(hdd, "vdi", pszUtf8Filename,
                       (uint64_t)cMBs * _1M,
@@ -274 +274 @@
     if (RT_SUCCESS(rc))
     {
-        PDMMEDIAGEOMETRY LCHSGeometry = {0, 0, 0};
+        VDGEOMETRY LCHSGeometry = {0, 0, 0};
         rc = VDIDiskSetLCHSGeometry(pVdi, &LCHSGeometry);
     }