儲存庫 vbox 的更動 17110

時間撮記:

2009-2-25 上午08:58:45 (16 年 以前)

作者:

vboxsync

訊息:

resurrected parts of vditool

位置:

trunk/src/VBox/Devices/Storage/testcase

檔案:

• Makefile.kmk (修改) (1 筆差異)
• vditool.cpp (修改) (14 筆差異)

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

@@ -27 +27 @@
 # probably will go away soon. Testcase only now.
 #
-#ifdef VBOX_WITH_TESTCASES
-# PROGRAMS += vditool
-# ifeq ($(KBUILD_TARGET),l4)
-#  vditool_TEMPLATE = VBOXLNXHOSTR3EXE
-#  vditool_LIBS     = \
-#       $(PATH_LIB)/VBoxDDULnxHostR3.a \
-#       $(PATH_LIB)/RuntimeLnxHostR3.a
-# else
-#  vditool_TEMPLATE = VBOXR3TSTEXE
-#  vditool_LIBS     = $(LIB_DDU) $(LIB_RUNTIME)
-# endif
-# vditool_SOURCES   = vditool.cpp
-#endif
+ifdef VBOX_WITH_TESTCASES
+ PROGRAMS += vditool
+  vditool_TEMPLATE = VBOXR3TSTEXE
+  vditool_LIBS     = $(LIB_DDU) $(LIB_RUNTIME)
+ vditool_SOURCES   = vditool.cpp
+endif
 
 

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

@@ -45 +45 @@
 static int UsageExit()
 {
-    RTPrintf("Usage:   vditool <Command> [Params]\n" \
-             "Commands and params:\n" \
-             "    NEW Filename Mbytes          - create new image;\n" \
-             "    DD  Filename DDFilename      - create new image from DD format image;\n" \
-             "    CONVERT Filename             - convert VDI image from old format;\n" \
-             "    DUMP Filename                - debug dump;\n" \
-             "    RESETGEO Filename            - reset geometry information;\n" \
-             "    COPY FromImage ToImage       - make image copy;\n" \
-             "    COPYDD FromImage DDFilename  - make a DD copy of the image;\n" \
-             "    SHRINK Filename              - optimize (reduce) VDI image size.\n");
+    RTPrintf("Usage:   vditool <Command> [Params]\n"
+             "Commands and params:\n"
+             "    NEW Filename Mbytes          - create new image\n"
+#if 0
+             "    DD  Filename DDFilename      - create new image from DD format image\n"
+             "    CONVERT Filename             - convert VDI image from old format\n"
+             "    DUMP Filename                - debug dump\n"
+             "    RESETGEO Filename            - reset geometry information\n"
+             "    COPY FromImage ToImage       - make image copy\n"
+             "    COPYDD FromImage DDFilename  - make a DD copy of the image\n"
+             "    SHRINK Filename              - optimize (reduce) VDI image size\n"
+#endif
+             );
     return 1;
 }
@@ -104 +107 @@
         return rc;
 
-    rc = VDICreateBaseImage(pszUtf8Filename,
-                            VDI_IMAGE_TYPE_NORMAL,
-                            (uint64_t)cMBs * (uint64_t)(1024 * 1024),
-                            "Newly created test image", NULL, NULL);
-    return PrintDone(rc);
-}
-
+    PVBOXHDD hdd;
+    rc = VDCreate(NULL, &hdd);
+    if (RT_FAILURE(rc))
+        return PrintDone(rc);
+    
+    PDMMEDIAGEOMETRY geo = { 0 }; /* auto-detect */
+    rc = VDCreateBase(hdd, "vdi", pszUtf8Filename,
+                      VD_IMAGE_TYPE_NORMAL,
+                      (uint64_t)cMBs * _1M,
+                      VD_IMAGE_FLAGS_NONE,
+                      "Newly created test image",
+                      &geo, &geo, NULL,
+                      VD_OPEN_FLAGS_NORMAL,
+                      NULL, NULL);
+    return PrintDone(rc);
+}
+
+#if 0
 static int ConvertDDImage(const char *pszFilename, const char *pszDDFilename)
 {
@@ -189 +203 @@
     return rc;
 }
-
+#endif
+
+#if 0
 static DECLCALLBACK(int) ProcessCallback(PVM pVM, unsigned uPercent, void *pvUser)
 {
@@ -205 +221 @@
     return VINF_SUCCESS;
 }
-
+#endif
+
+#if 0
 static int ConvertOldImage(const char *pszFilename)
 {
@@ -223 +241 @@
     return PrintDone(rc);
 }
-
+#endif
+
+#if 0
 static int DumpImage(const char *pszFilename)
 {
@@ -242 +262 @@
     return PrintDone(rc);
 }
-
+#endif
+
+#if 0
 static int ResetImageGeometry(const char *pszFilename)
 {
@@ -263 +285 @@
     return PrintDone(rc);
 }
-
+#endif
+
+#if 0
 static int CopyImage(const char *pszDstFile, const char *pszSrcFile)
 {
@@ -284 +308 @@
     return PrintDone(rc);
 }
-
+#endif
+
+#if 0
 static int CopyToDD(const char *pszDstFile, const char *pszSrcFile)
 {
@@ -331 +357 @@
     return PrintDone(rc);
 }
-
+#endif
+
+#if 0
 static int ShrinkImage(const char *pszFilename)
 {
@@ -349 +377 @@
     return PrintDone(rc);
 }
+#endif
 
 int main(int argc, char **argv)
@@ -356 +385 @@
 
     RTR3Init();
-    RTPrintf("vditool    Copyright (c) 2008 Sun Microsystems, Inc.\n\n");
+    RTPrintf("vditool -- for internal use only!\n"
+             "Copyright (c) 2009 Sun Microsystems, Inc.\n\n");
 
     /*
@@ -386 +416 @@
         if (RT_FAILURE(rc))
             return SyntaxError("Invalid number!");
-        if (    cMBs < 2
-            ||  cMBs > 1024*1024)
+        if (cMBs < 2 || cMBs > _1M)
         {
             RTPrintf("error: Disk size %RU32 (MB) is not within the range %u-%u!\n",
-                     cMBs, 2, 1024*1024);
+                     cMBs, 2, _1M);
             return 1;
         }
@@ -396 +425 @@
         rc = NewImage(argv[2], cMBs);
     }
+#if 0
     else if (strcmp(szCmd, "DD") == 0)
     {
@@ -438 +468 @@
         rc = ShrinkImage(argv[2]);
     }
+#endif
     else
         return SyntaxError("Invalid command!");