VirtualBox

Ignore:
Timestamp:
Mar 16, 2009 7:08:16 PM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
44552
Message:

API/HardDisk, Storage/VBoxHDD, Frontend/VBoxManage: eliminated base image type, which led to much unnecessary code duplication. Was triggered by VBoxManage finally being able to create all image variants the backends can support.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r17836 r17970  
    5656
    5757static int tstVDCreateDelete(const char *pszBackend, const char *pszFilename,
    58                              uint64_t cbSize, VDIMAGETYPE enmType,
    59                              unsigned uFlags, bool fDelete)
     58                             uint64_t cbSize, unsigned uFlags, bool fDelete)
    6059{
    6160    int rc;
    … …  
    9089    CHECK("VDCreate()");
    9190
    92     rc = VDCreateBase(pVD, pszBackend, pszFilename, enmType, cbSize,
     91    rc = VDCreateBase(pVD, pszBackend, pszFilename, cbSize,
    9392                      uFlags, "Test image", &PCHS, &LCHS, NULL,
    9493                      VD_OPEN_FLAGS_NORMAL, NULL, NULL);
    … …  
    556555    else
    557556    {
    558         rc = VDCreateBase(pVD, pszBackend, pszBaseFilename,
    559                           VD_IMAGE_TYPE_NORMAL, u64DiskSize,
     557        rc = VDCreateBase(pVD, pszBackend, pszBaseFilename, u64DiskSize,
    560558                          VD_IMAGE_FLAGS_NONE, "Test image",
    561559                          &PCHS, &LCHS, NULL, VD_OPEN_FLAGS_NORMAL,
    … …  
    667665    }
    668666
    669     rc = VDCreateBase(pVD, pszBackend, pszFilename,
    670                       VD_IMAGE_TYPE_NORMAL, u64DiskSize,
     667    rc = VDCreateBase(pVD, pszBackend, pszFilename, u64DiskSize,
    671668                      VD_IMAGE_FLAGS_NONE, "Test image",
    672669                      &PCHS, &LCHS, NULL, VD_OPEN_FLAGS_NORMAL,
    … …  
    744741
    745742static int tstVmdkCreateRenameOpen(const char *src, const char *dst,
    746                                    uint64_t cbSize, VDIMAGETYPE enmType,
    747                                    unsigned uFlags)
    748 {
    749     int rc = tstVDCreateDelete("VMDK", src, cbSize, enmType, uFlags, false);
     743                                   uint64_t cbSize, unsigned uFlags)
     744{
     745    int rc = tstVDCreateDelete("VMDK", src, cbSize, uFlags, false);
    750746    if (RT_FAILURE(rc))
    751747        return rc;
    … …  
    802798{
    803799    int rc = tstVmdkCreateRenameOpen("tmpVDCreate.vmdk", "tmpVDRename.vmdk", _4G,
    804                                  VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE);
     800                                     VD_IMAGE_FLAGS_NONE);
    805801    if (RT_FAILURE(rc))
    806802    {
    … …  
    809805    }
    810806    rc = tstVmdkCreateRenameOpen("tmpVDCreate.vmdk", "tmpVDRename.vmdk", _4G,
    811                                  VD_IMAGE_TYPE_NORMAL, VD_VMDK_IMAGE_FLAGS_SPLIT_2G);
     807                                 VD_VMDK_IMAGE_FLAGS_SPLIT_2G);
    812808    if (RT_FAILURE(rc))
    813809    {
    … …  
    816812    }
    817813    rc = tstVmdkCreateRenameOpen("tmpVDCreate.vmdk", DST_PATH, _4G,
    818                                  VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE);
     814                                 VD_IMAGE_FLAGS_NONE);
    819815    if (RT_FAILURE(rc))
    820816    {
    … …  
    823819    }
    824820    rc = tstVmdkCreateRenameOpen("tmpVDCreate.vmdk", DST_PATH, _4G,
    825                                  VD_IMAGE_TYPE_NORMAL, VD_VMDK_IMAGE_FLAGS_SPLIT_2G);
     821                                 VD_VMDK_IMAGE_FLAGS_SPLIT_2G);
    826822    if (RT_FAILURE(rc))
    827823    {
    … …  
    836832
    837833    rc = tstVmdkCreateRenameOpen("tmpVDCreate.vmdk", DST_PATH, _4G,
    838                                  VD_IMAGE_TYPE_NORMAL, VD_VMDK_IMAGE_FLAGS_SPLIT_2G);
     834                                 VD_VMDK_IMAGE_FLAGS_SPLIT_2G);
    839835    if (RT_SUCCESS(rc))
    840836    {
    … …  
    902898#ifdef VMDK_TEST
    903899    rc = tstVDCreateDelete("VMDK", "tmpVDCreate.vmdk", 2 * _4G,
    904                            VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
    905                            true);
     900                           VD_IMAGE_FLAGS_NONE, true);
    906901    if (RT_FAILURE(rc))
    907902    {
    … …  
    910905    }
    911906    rc = tstVDCreateDelete("VMDK", "tmpVDCreate.vmdk", 2 * _4G,
    912                            VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
    913                            false);
     907                           VD_IMAGE_FLAGS_NONE, false);
    914908    if (RT_FAILURE(rc))
    915909    {
    … …  
    928922#ifdef VDI_TEST
    929923    rc = tstVDCreateDelete("VDI", "tmpVDCreate.vdi", 2 * _4G,
    930                            VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
    931                            true);
     924                           VD_IMAGE_FLAGS_NONE, true);
    932925    if (RT_FAILURE(rc))
    933926    {
    … …  
    936929    }
    937930    rc = tstVDCreateDelete("VDI", "tmpVDCreate.vdi", 2 * _4G,
    938                            VD_IMAGE_TYPE_FIXED, VD_IMAGE_FLAGS_NONE,
    939                            true);
     931                           VD_IMAGE_FLAGS_NONE, true);
    940932    if (RT_FAILURE(rc))
    941933    {
    … …  
    946938#ifdef VMDK_TEST
    947939    rc = tstVDCreateDelete("VMDK", "tmpVDCreate.vmdk", 2 * _4G,
    948                            VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
    949                            true);
     940                           VD_IMAGE_FLAGS_NONE, true);
    950941    if (RT_FAILURE(rc))
    951942    {
    … …  
    954945    }
    955946    rc = tstVDCreateDelete("VMDK", "tmpVDCreate.vmdk", 2 * _4G,
    956                            VD_IMAGE_TYPE_NORMAL, VD_VMDK_IMAGE_FLAGS_SPLIT_2G,
    957                            true);
     947                           VD_VMDK_IMAGE_FLAGS_SPLIT_2G, true);
    958948    if (RT_FAILURE(rc))
    959949    {
    … …  
    962952    }
    963953    rc = tstVDCreateDelete("VMDK", "tmpVDCreate.vmdk", 2 * _4G,
    964                            VD_IMAGE_TYPE_FIXED, VD_IMAGE_FLAGS_NONE,
    965                            true);
     954                           VD_IMAGE_FLAGS_FIXED, true);
    966955    if (RT_FAILURE(rc))
    967956    {
    … …  
    970959    }
    971960    rc = tstVDCreateDelete("VMDK", "tmpVDCreate.vmdk", 2 * _4G,
    972                            VD_IMAGE_TYPE_FIXED, VD_VMDK_IMAGE_FLAGS_SPLIT_2G,
     961                           VD_IMAGE_FLAGS_FIXED | VD_VMDK_IMAGE_FLAGS_SPLIT_2G,
    973962                           true);
    974963    if (RT_FAILURE(rc))
    … …  
    980969#ifdef VHD_TEST
    981970    rc = tstVDCreateDelete("VHD", "tmpVDCreate.vhd", 2 * _4G,
    982                            VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
    983                            true);
     971                           VD_IMAGE_FLAGS_NONE, true);
    984972    if (RT_FAILURE(rc))
    985973    {
    … …  
    988976    }
    989977    rc = tstVDCreateDelete("VHD", "tmpVDCreate.vhd", 2 * _4G,
    990                            VD_IMAGE_TYPE_FIXED, VD_IMAGE_FLAGS_NONE,
    991                            true);
     978                           VD_IMAGE_FLAGS_FIXED, true);
    992979    if (RT_FAILURE(rc))
    993980    {
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette