Changeset 61731 in vbox for trunk/src

Timestamp:

Jun 16, 2016 3:06:20 PM (9 years ago)

Author:

vboxsync

Message:

Storage/tstVDFill: Add flag for stream optimized variants

File:

• trunk/src/VBox/Storage/testcase/tstVDFill.cpp (modified) (7 diffs)

trunk/src/VBox/Storage/testcase/tstVDFill.cpp

@@ -54 +54 @@
 }
 
-static int tstFill(const char *pszFilename, const char *pszFormat, uint64_t cbDisk, uint64_t cbFill)
+static int tstFill(const char *pszFilename, const char *pszFormat, bool fStreamOptimized, uint64_t cbDisk, uint64_t cbFill)
 {
     int rc;
@@ -100 +100 @@
 
     rc = VDCreateBase(pVD, pszFormat, pszFilename, cbDisk,
-                      VD_IMAGE_FLAGS_NONE, "Test image",
-                      &PCHS, &LCHS, NULL, VD_OPEN_FLAGS_NORMAL,
+                      fStreamOptimized ? VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED : VD_IMAGE_FLAGS_NONE,
+                      "Test image", &PCHS, &LCHS, NULL, VD_OPEN_FLAGS_NORMAL,
                       NULL, NULL);
     CHECK("VDCreateBase()");
@@ -143 +143 @@
              "--filename <filename>       Filename of the image\n"
              "--format <VDI|VMDK|...>     Format to use\n"
+             "--streamoptimized           Use the stream optimized format\n"
              "--help                      Show this text\n");
 }
@@ -148 +149 @@
 static const RTGETOPTDEF g_aOptions[] =
 {
-    { "--disk-size",   's', RTGETOPT_REQ_UINT64 },
-    { "--fill-size",   'f', RTGETOPT_REQ_UINT64 },
-    { "--filename",    'p', RTGETOPT_REQ_STRING },
-    { "--format",      't', RTGETOPT_REQ_STRING },
-    { "--help",        'h', RTGETOPT_REQ_NOTHING }
+    { "--disk-size",       's', RTGETOPT_REQ_UINT64 },
+    { "--fill-size",       'f', RTGETOPT_REQ_UINT64 },
+    { "--filename",        'p', RTGETOPT_REQ_STRING },
+    { "--format",          't', RTGETOPT_REQ_STRING },
+    { "--streamoptimized", 'r', RTGETOPT_REQ_NOTHING },
+    { "--help",            'h', RTGETOPT_REQ_NOTHING }
 };
 
@@ -166 +168 @@
     const char *pszFilename = NULL;
     const char *pszFormat = NULL;
+    bool fStreamOptimized = false;
 
     rc = VDInit();
@@ -191 +194 @@
                 pszFormat = ValueUnion.psz;
                 break;
+            case 'r':
+                fStreamOptimized = true;
+                break;
             case 'h':
             default:
@@ -213 +219 @@
     RTRandAdvSeed(g_hRand, 0x12345678);
 
-    rc = tstFill(pszFilename, pszFormat, cbDisk, cbFill);
+    rc = tstFill(pszFilename, pszFormat, fStreamOptimized, cbDisk, cbFill);
     if (RT_FAILURE(rc))
         RTPrintf("tstVDFill: Filling disk failed! rc=%Rrc\n", rc);