Changeset 38204 in vbox for trunk/src/VBox/Storage

Timestamp:

Jul 27, 2011 4:14:59 PM (14 years ago)

Author:

vboxsync

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

73172

Message:

tstVDIo: New testcase for image cloning

Location:

trunk/src/VBox/Storage/testcase

Files:

• tstVDCopy.vd (added)
• tstVDIo.cpp (modified) (4 diffs)
• tstVDIo.vd (modified) (3 diffs)

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

@@ -300 +300 @@
 static DECLCALLBACK(int) vdScriptHandlerMerge(PVDTESTGLOB pGlob, PVDSCRIPTARG paScriptArgs, unsigned cScriptArgs);
 static DECLCALLBACK(int) vdScriptHandlerCompact(PVDTESTGLOB pGlob, PVDSCRIPTARG paScriptArgs, unsigned cScriptArgs);
+static DECLCALLBACK(int) vdScriptHandlerCopy(PVDTESTGLOB pGlob, PVDSCRIPTARG paScriptArgs, unsigned cScriptArgs);
 static DECLCALLBACK(int) vdScriptHandlerClose(PVDTESTGLOB pGlob, PVDSCRIPTARG paScriptArgs, unsigned cScriptArgs);
 static DECLCALLBACK(int) vdScriptHandlerIoRngCreate(PVDTESTGLOB pGlob, PVDSCRIPTARG paScriptArgs, unsigned cScriptArgs);
@@ -377 +378 @@
 };
 
+/* Compact a disk */
+const VDSCRIPTARGDESC g_aArgCopy[] =
+{
+    /* pcszName    chId enmType                          fFlags */
+    {"diskfrom",   's', VDSCRIPTARGTYPE_STRING,          VDSCRIPTARGDESC_FLAG_MANDATORY},
+    {"diskto",     'd', VDSCRIPTARGTYPE_STRING,          VDSCRIPTARGDESC_FLAG_MANDATORY},
+    {"imagefrom",  'i', VDSCRIPTARGTYPE_UNSIGNED_NUMBER, VDSCRIPTARGDESC_FLAG_MANDATORY},
+    {"backend",    'b', VDSCRIPTARGTYPE_STRING,          0},
+    {"filename",   'f', VDSCRIPTARGTYPE_STRING,          0},
+    {"movebyrename", 'm', VDSCRIPTARGTYPE_BOOL,          0},
+    {"size",       'z', VDSCRIPTARGTYPE_UNSIGNED_NUMBER, 0},
+    {"fromsame",   'o', VDSCRIPTARGTYPE_UNSIGNED_NUMBER, 0},
+    {"tosame",     't', VDSCRIPTARGTYPE_UNSIGNED_NUMBER, 0}
+};
+
 /* close action */
 const VDSCRIPTARGDESC g_aArgClose[] =
@@ -481 +497 @@
     {"merge",                      g_aArgMerge,                       RT_ELEMENTS(g_aArgMerge),                      vdScriptHandlerMerge},
     {"compact",                    g_aArgCompact,                     RT_ELEMENTS(g_aArgCompact),                    vdScriptHandlerCompact},
+    {"copy",                       g_aArgCopy,                        RT_ELEMENTS(g_aArgCopy),                       vdScriptHandlerCopy},
     {"iorngcreate",                g_aArgIoRngCreate,                 RT_ELEMENTS(g_aArgIoRngCreate),                vdScriptHandlerIoRngCreate},
     {"iorngdestroy",               NULL,                              0,                                             vdScriptHandlerIoRngDestroy},
@@ -1185 +1202 @@
              */
             rc = VDCompact(pDisk->pVD, nImage, NULL);
+        }
+    }
+
+    return rc;
+}
+
+static DECLCALLBACK(int) vdScriptHandlerCopy(PVDTESTGLOB pGlob, PVDSCRIPTARG paScriptArgs, unsigned cScriptArgs)
+{
+    int rc = VINF_SUCCESS;
+    const char *pcszDiskFrom = NULL;
+    const char *pcszDiskTo = NULL;
+    PVDDISK pDiskFrom = NULL;
+    PVDDISK pDiskTo = NULL;
+    unsigned nImageFrom = 0;
+    const char *pcszBackend = NULL;
+    const char *pcszFilename = NULL;
+    bool fMoveByRename = false;
+    uint64_t cbSize = 0;
+    unsigned nImageFromSame = VD_IMAGE_CONTENT_UNKNOWN;
+    unsigned nImageToSame = VD_IMAGE_CONTENT_UNKNOWN;
+
+    for (unsigned i = 0; i < cScriptArgs; i++)
+    {
+        switch (paScriptArgs[i].chId)
+        {
+            case 's':
+            {
+                pcszDiskFrom = paScriptArgs[i].u.pcszString;
+                break;
+            }
+            case 'd':
+            {
+                pcszDiskTo = paScriptArgs[i].u.pcszString;
+                break;
+            }
+            case 'i':
+            {
+                nImageFrom = (unsigned)paScriptArgs[i].u.u64;
+                break;
+            }
+            case 'b':
+            {
+                pcszBackend = paScriptArgs[i].u.pcszString;
+                break;
+            }
+            case 'f':
+            {
+                pcszFilename = paScriptArgs[i].u.pcszString;
+                break;
+            }
+            case 'm':
+            {
+                fMoveByRename = paScriptArgs[i].u.fFlag;
+                break;
+            }
+            case 'z':
+            {
+                cbSize = paScriptArgs[i].u.u64;
+                break;
+            }
+            case 'o':
+            {
+                nImageFromSame = (unsigned)paScriptArgs[i].u.u64;
+                break;
+            }
+            case 't':
+            {
+                nImageToSame = (unsigned)paScriptArgs[i].u.u64;
+                break;
+            }
+
+            default:
+                AssertMsgFailed(("Invalid argument given!\n"));
+        }
+
+        if (RT_FAILURE(rc))
+            break;
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        pDiskFrom = tstVDIoGetDiskByName(pGlob, pcszDiskFrom);
+        pDiskTo = tstVDIoGetDiskByName(pGlob, pcszDiskTo);
+        if (!pDiskFrom || !pDiskTo)
+            rc = VERR_NOT_FOUND;
+        else
+        {
+            /** @todo: Provide progress interface to test that cancelation
+             * works as intended.
+             */
+            rc = VDCopyEx(pDiskFrom->pVD, nImageFrom, pDiskTo->pVD, pcszBackend, pcszFilename,
+                          fMoveByRename, cbSize, nImageFromSame, nImageToSame,
+                          VD_IMAGE_FLAGS_NONE, NULL, VD_OPEN_FLAGS_ASYNC_IO,
+                          NULL, pGlob->pInterfacesImages, NULL);
         }
     }

trunk/src/VBox/Storage/testcase/tstVDIo.vd

@@ -25 +25 @@
 io disk=test async=yes max-reqs=32 mode=seq blocksize=64k off=0-200M size=200M writes=100
 io disk=test async=yes max-reqs=32 mode=seq blocksize=64k off=0-200M size=200M writes=0
-create disk=test mode=diff name=tstShared2.vmdk type=dynamic backend=VMDK size=20M
+create disk=test mode=diff name=tstShared2.vmdk type=dynamic backend=VMDK size=200M
 io disk=test async=yes max-reqs=32 mode=rnd blocksize=64k off=0-200M size=200M writes=50
-create disk=test mode=diff name=tstShared3.vmdk type=dynamic backend=VMDK size=20M
+create disk=test mode=diff name=tstShared3.vmdk type=dynamic backend=VMDK size=200M
 io disk=test async=yes max-reqs=32 mode=rnd blocksize=64k off=0-200M size=200M writes=50
 close disk=test mode=single delete=yes
@@ -40 +40 @@
 io disk=test async=yes max-reqs=32 mode=seq blocksize=64k off=0-200M size=200M writes=100
 io disk=test async=yes max-reqs=32 mode=seq blocksize=64k off=0-200M size=200M writes=0
-create disk=test mode=diff name=tstShared2.vdi type=dynamic backend=VDI size=20M
+create disk=test mode=diff name=tstShared2.vdi type=dynamic backend=VDI size=200M
 io disk=test async=yes max-reqs=32 mode=rnd blocksize=64k off=0-200M size=200M writes=50
-create disk=test mode=diff name=tstShared3.vdi type=dynamic backend=VDI size=20M
+create disk=test mode=diff name=tstShared3.vdi type=dynamic backend=VDI size=200M
 io disk=test async=yes max-reqs=32 mode=rnd blocksize=64k off=0-200M size=200M writes=50
 close disk=test mode=single delete=yes
@@ -55 +55 @@
 io disk=test async=yes max-reqs=32 mode=seq blocksize=64k off=0-200M size=200M writes=100
 io disk=test async=yes max-reqs=32 mode=seq blocksize=64k off=0-200M size=200M writes=0
-create disk=test mode=diff name=tstShared2.vhd type=dynamic backend=VHD size=20M
+create disk=test mode=diff name=tstShared2.vhd type=dynamic backend=VHD size=200M
 io disk=test async=yes max-reqs=32 mode=rnd blocksize=64k off=0-200M size=200M writes=50
-create disk=test mode=diff name=tstShared3.vhd type=dynamic backend=VHD size=20M
+create disk=test mode=diff name=tstShared3.vhd type=dynamic backend=VHD size=200M
 io disk=test async=yes max-reqs=32 mode=rnd blocksize=64k off=0-200M size=200M writes=50
 close disk=test mode=single delete=yes