VirtualBox

Ignore:
Timestamp:
Feb 17, 2009 5:00:56 PM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
42975
Message:

Main: rename IHardDiskImage2 to IHardDiskImage; rename IFloppyImage2 to IFloppyImage; rename all media-related methods with a '2' suffix

Location:
trunk/src/VBox/Frontends/VBoxManage
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp

    r16530 r16867  
    12481248    if (fRegister)
    12491249    {
    1250         ComPtr<IHardDisk2> hardDisk;
    1251         CHECK_ERROR(aVirtualBox, OpenHardDisk2(filename, hardDisk.asOutParam()));
     1250        ComPtr<IHardDisk> hardDisk;
     1251        CHECK_ERROR(aVirtualBox, OpenHardDisk(filename, hardDisk.asOutParam()));
    12521252    }
    12531253

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

    r16853 r16867  
    14141414                /* first assume it's a UUID */
    14151415                Guid uuid(a->argv[2]);
    1416                 ComPtr<IFloppyImage2> floppyImage;
     1416                ComPtr<IFloppyImage> floppyImage;
    14171417                rc = a->virtualBox->GetFloppyImage(uuid, floppyImage.asOutParam());
    14181418                if (FAILED(rc) || !floppyImage)

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp

    r16853 r16867  
    122122        return errorArgument("Invalid hard disk type '%s' specified", Utf8Str(type).raw());
    123123
    124     ComPtr<IHardDisk2> hardDisk;
    125     CHECK_ERROR(a->virtualBox, CreateHardDisk2(format, filename, hardDisk.asOutParam()));
     124    ComPtr<IHardDisk> hardDisk;
     125    CHECK_ERROR(a->virtualBox, CreateHardDisk(format, filename, hardDisk.asOutParam()));
    126126    if (SUCCEEDED(rc) && hardDisk)
    127127    {
    … …  
    215215        return errorSyntax(USAGE_MODIFYHD, "Incorrect number of parameters");
    216216
    217     ComPtr<IHardDisk2> hardDisk;
     217    ComPtr<IHardDisk> hardDisk;
    218218    Bstr filepath;
    219219
    220220    /* first guess is that it's a UUID */
    221221    Guid uuid(a->argv[0]);
    222     rc = a->virtualBox->GetHardDisk2(uuid, hardDisk.asOutParam());
     222    rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam());
    223223    /* no? then it must be a filename */
    224224    if (!hardDisk)
    225225    {
    226226        filepath = a->argv[0];
    227         CHECK_ERROR(a->virtualBox, FindHardDisk2(filepath, hardDisk.asOutParam()));
     227        CHECK_ERROR(a->virtualBox, FindHardDisk(filepath, hardDisk.asOutParam()));
    228228    }
    229229
    … …  
    277277        if (!hardDisk)
    278278        {
    279             a->virtualBox->OpenHardDisk2(Bstr(a->argv[0]), hardDisk.asOutParam());
     279            a->virtualBox->OpenHardDisk(Bstr(a->argv[0]), hardDisk.asOutParam());
    280280            if (!hardDisk)
    281281                return errorArgument("Hard disk image not found");
    … …  
    354354        return errorSyntax(USAGE_CLONEHD, "Mandatory output file parameter missing");
    355355
    356     ComPtr<IHardDisk2> srcDisk;
    357     ComPtr<IHardDisk2> dstDisk;
     356    ComPtr<IHardDisk> srcDisk;
     357    ComPtr<IHardDisk> dstDisk;
    358358    bool unknown = false;
    359359
    360360    /* first guess is that it's a UUID */
    361361    Guid uuid(Utf8Str(src).raw());
    362     rc = a->virtualBox->GetHardDisk2(uuid, srcDisk.asOutParam());
     362    rc = a->virtualBox->GetHardDisk(uuid, srcDisk.asOutParam());
    363363    /* no? then it must be a filename */
    364364    if (FAILED (rc))
    365365    {
    366         rc = a->virtualBox->FindHardDisk2(src, srcDisk.asOutParam());
     366        rc = a->virtualBox->FindHardDisk(src, srcDisk.asOutParam());
    367367        /* no? well, then it's an unkwnown image */
    368368        if (FAILED (rc))
    369369        {
    370             CHECK_ERROR(a->virtualBox, OpenHardDisk2(src, srcDisk.asOutParam()));
     370            CHECK_ERROR(a->virtualBox, OpenHardDisk(src, srcDisk.asOutParam()));
    371371            if (SUCCEEDED (rc))
    372372            {
    … …  
    387387        }
    388388
    389         CHECK_ERROR_BREAK(a->virtualBox, CreateHardDisk2(format, dst, dstDisk.asOutParam()));
     389        CHECK_ERROR_BREAK(a->virtualBox, CreateHardDisk(format, dst, dstDisk.asOutParam()));
    390390
    391391        ComPtr<IProgress> progress;
    … …  
    679679    do
    680680    {
    681         ComPtr<IHardDisk2> hardDisk;
     681        ComPtr<IHardDisk> hardDisk;
    682682        CHECK_ERROR_BREAK (a->virtualBox,
    683             CreateHardDisk2(Bstr ("iSCSI"),
    684                             BstrFmt ("%ls/%ls", server.raw(), target.raw()),
    685                             hardDisk.asOutParam()));
     683            CreateHardDisk(Bstr ("iSCSI"),
     684                           BstrFmt ("%ls/%ls", server.raw(), target.raw()),
     685                           hardDisk.asOutParam()));
    686686        CheckComRCBreakRC (rc);
    687687
    … …  
    749749        return errorSyntax(USAGE_SHOWHDINFO, "Incorrect number of parameters");
    750750
    751     ComPtr<IHardDisk2> hardDisk;
     751    ComPtr<IHardDisk> hardDisk;
    752752    Bstr filepath;
    753753
    … …  
    756756    /* first guess is that it's a UUID */
    757757    Guid uuid(a->argv[0]);
    758     rc = a->virtualBox->GetHardDisk2(uuid, hardDisk.asOutParam());
     758    rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam());
    759759    /* no? then it must be a filename */
    760760    if (FAILED (rc))
    761761    {
    762762        filepath = a->argv[0];
    763         rc = a->virtualBox->FindHardDisk2(filepath, hardDisk.asOutParam());
     763        rc = a->virtualBox->FindHardDisk(filepath, hardDisk.asOutParam());
    764764        /* no? well, then it's an unkwnown image */
    765765        if (FAILED (rc))
    766766        {
    767             CHECK_ERROR(a->virtualBox, OpenHardDisk2(filepath, hardDisk.asOutParam()));
     767            CHECK_ERROR(a->virtualBox, OpenHardDisk(filepath, hardDisk.asOutParam()));
    768768            if (SUCCEEDED (rc))
    769769            {
    … …  
    891891        }
    892892
    893         ComPtr<IHardDisk2> hardDisk;
    894         CHECK_ERROR(a->virtualBox, OpenHardDisk2(filepath, hardDisk.asOutParam()));
     893        ComPtr<IHardDisk> hardDisk;
     894        CHECK_ERROR(a->virtualBox, OpenHardDisk(filepath, hardDisk.asOutParam()));
    895895        if (SUCCEEDED(rc) && hardDisk)
    896896        {
    … …  
    914914    else if (strcmp(a->argv[0], "floppy") == 0)
    915915    {
    916         ComPtr<IFloppyImage2> floppyImage;
     916        ComPtr<IFloppyImage> floppyImage;
    917917        CHECK_ERROR(a->virtualBox, OpenFloppyImage(filepath, Guid(), floppyImage.asOutParam()));
    918918    }
    … …  
    935935    if (strcmp(a->argv[0], "disk") == 0)
    936936    {
    937         ComPtr<IHardDisk2> hardDisk;
    938         rc = a->virtualBox->GetHardDisk2(uuid, hardDisk.asOutParam());
     937        ComPtr<IHardDisk> hardDisk;
     938        rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam());
    939939        /* not a UUID or not registered? Then it must be a filename */
    940940        if (!hardDisk)
    941941        {
    942             CHECK_ERROR(a->virtualBox, FindHardDisk2(Bstr(a->argv[1]), hardDisk.asOutParam()));
     942            CHECK_ERROR(a->virtualBox, FindHardDisk(Bstr(a->argv[1]), hardDisk.asOutParam()));
    943943        }
    944944        if (SUCCEEDED(rc) && hardDisk)
    … …  
    965965    if (strcmp(a->argv[0], "floppy") == 0)
    966966    {
    967         ComPtr<IFloppyImage2> floppyImage;
     967        ComPtr<IFloppyImage> floppyImage;
    968968        rc = a->virtualBox->GetFloppyImage(uuid, floppyImage.asOutParam());
    969969        /* not a UUID or not registered? Then it must be a filename */

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

    r16853 r16867  
    384384                case DriveState_ImageMounted:
    385385                {
    386                     ComPtr<IFloppyImage2> floppyImage;
     386                    ComPtr<IFloppyImage> floppyImage;
    387387                    rc = floppyDrive->GetImage(floppyImage.asOutParam());
    388388                    if (SUCCEEDED(rc) && floppyImage)
    … …  
    461461    if (fSataEnabled)
    462462    {
    463         ComPtr<IHardDisk2> hardDisk;
     463        ComPtr<IHardDisk> hardDisk;
    464464        Bstr  filePath;
    465465        ULONG cSataPorts;
    … …  
    468468        for (ULONG i = 0; i < cSataPorts; ++ i)
    469469        {
    470             rc = machine->GetHardDisk2(StorageBus_SATA, i, 0, hardDisk.asOutParam());
     470            rc = machine->GetHardDisk(StorageBus_SATA, i, 0, hardDisk.asOutParam());
    471471            if (SUCCEEDED(rc) && hardDisk)
    472472            {
    … …  
    512512        RTPrintf("IDE Controller:  %s\n", pszIdeController);
    513513
    514     ComPtr<IHardDisk2> hardDisk;
     514    ComPtr<IHardDisk> hardDisk;
    515515    Bstr filePath;
    516     rc = machine->GetHardDisk2(StorageBus_IDE, 0, 0, hardDisk.asOutParam());
     516    rc = machine->GetHardDisk(StorageBus_IDE, 0, 0, hardDisk.asOutParam());
    517517    if (SUCCEEDED(rc) && hardDisk)
    518518    {
    … …  
    532532            RTPrintf("hda=\"none\"\n");
    533533    }
    534     rc = machine->GetHardDisk2(StorageBus_IDE, 0, 1, hardDisk.asOutParam());
     534    rc = machine->GetHardDisk(StorageBus_IDE, 0, 1, hardDisk.asOutParam());
    535535    if (SUCCEEDED(rc) && hardDisk)
    536536    {
    … …  
    550550            RTPrintf("hdb=\"none\"\n");
    551551    }
    552     rc = machine->GetHardDisk2(StorageBus_IDE, 1, 1, hardDisk.asOutParam());
     552    rc = machine->GetHardDisk(StorageBus_IDE, 1, 1, hardDisk.asOutParam());
    553553    if (SUCCEEDED(rc) && hardDisk)
    554554    {

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

    r16853 r16867  
    389389    if (strcmp(a->argv[0], "hdds") == 0)
    390390    {
    391         com::SafeIfaceArray <IHardDisk2> hdds;
    392         CHECK_ERROR(a->virtualBox, COMGETTER(HardDisks2)(ComSafeArrayAsOutParam (hdds)));
     391        com::SafeIfaceArray<IHardDisk> hdds;
     392        CHECK_ERROR(a->virtualBox, COMGETTER(HardDisks)(ComSafeArrayAsOutParam (hdds)));
    393393        for (size_t i = 0; i < hdds.size(); ++ i)
    394394        {
    395             ComPtr<IHardDisk2> hdd = hdds[i];
     395            ComPtr<IHardDisk> hdd = hdds[i];
    396396            Guid uuid;
    397397            hdd->COMGETTER(Id)(uuid.asOutParam());
    … …  
    452452    if (strcmp(a->argv[0], "floppies") == 0)
    453453    {
    454         com::SafeIfaceArray<IFloppyImage2> floppies;
     454        com::SafeIfaceArray<IFloppyImage> floppies;
    455455        CHECK_ERROR(a->virtualBox, COMGETTER(FloppyImages)(ComSafeArrayAsOutParam(floppies)));
    456456        for (size_t i = 0; i < floppies.size(); ++ i)
    457457        {
    458             ComPtr<IFloppyImage2> floppyImage = floppies[i];
     458            ComPtr<IFloppyImage> floppyImage = floppies[i];
    459459            Guid uuid;
    460460            floppyImage->COMGETTER(Id)(uuid.asOutParam());

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

    r16853 r16867  
    980980            if (strcmp(hdds[0], "none") == 0)
    981981            {
    982                 machine->DetachHardDisk2(StorageBus_IDE, 0, 0);
     982                machine->DetachHardDisk(StorageBus_IDE, 0, 0);
    983983            }
    984984            else
    … …  
    986986                /* first guess is that it's a UUID */
    987987                Guid uuid(hdds[0]);
    988                 ComPtr<IHardDisk2> hardDisk;
    989                 rc = a->virtualBox->GetHardDisk2(uuid, hardDisk.asOutParam());
     988                ComPtr<IHardDisk> hardDisk;
     989                rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam());
    990990                /* not successful? Then it must be a filename */
    991991                if (!hardDisk)
    992992                {
    993                     CHECK_ERROR(a->virtualBox, FindHardDisk2(Bstr(hdds[0]), hardDisk.asOutParam()));
     993                    CHECK_ERROR(a->virtualBox, FindHardDisk(Bstr(hdds[0]), hardDisk.asOutParam()));
    994994                    if (FAILED(rc))
    995995                    {
    996996                        /* open the new hard disk object */
    997                         CHECK_ERROR(a->virtualBox, OpenHardDisk2(Bstr(hdds[0]), hardDisk.asOutParam()));
     997                        CHECK_ERROR(a->virtualBox, OpenHardDisk(Bstr(hdds[0]), hardDisk.asOutParam()));
    998998                    }
    999999                }
    … …  
    10011001                {
    10021002                    hardDisk->COMGETTER(Id)(uuid.asOutParam());
    1003                     CHECK_ERROR(machine, AttachHardDisk2(uuid, StorageBus_IDE, 0, 0));
     1003                    CHECK_ERROR(machine, AttachHardDisk(uuid, StorageBus_IDE, 0, 0));
    10041004                }
    10051005                else
    … …  
    10131013            if (strcmp(hdds[1], "none") == 0)
    10141014            {
    1015                 machine->DetachHardDisk2(StorageBus_IDE, 0, 1);
     1015                machine->DetachHardDisk(StorageBus_IDE, 0, 1);
    10161016            }
    10171017            else
    … …  
    10191019                /* first guess is that it's a UUID */
    10201020                Guid uuid(hdds[1]);
    1021                 ComPtr<IHardDisk2> hardDisk;
    1022                 rc = a->virtualBox->GetHardDisk2(uuid, hardDisk.asOutParam());
     1021                ComPtr<IHardDisk> hardDisk;
     1022                rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam());
    10231023                /* not successful? Then it must be a filename */
    10241024                if (!hardDisk)
    10251025                {
    1026                     CHECK_ERROR(a->virtualBox, FindHardDisk2(Bstr(hdds[1]), hardDisk.asOutParam()));
     1026                    CHECK_ERROR(a->virtualBox, FindHardDisk(Bstr(hdds[1]), hardDisk.asOutParam()));
    10271027                    if (FAILED(rc))
    10281028                    {
    10291029                        /* open the new hard disk object */
    1030                         CHECK_ERROR(a->virtualBox, OpenHardDisk2(Bstr(hdds[1]), hardDisk.asOutParam()));
     1030                        CHECK_ERROR(a->virtualBox, OpenHardDisk(Bstr(hdds[1]), hardDisk.asOutParam()));
    10311031                    }
    10321032                }
    … …  
    10341034                {
    10351035                    hardDisk->COMGETTER(Id)(uuid.asOutParam());
    1036                     CHECK_ERROR(machine, AttachHardDisk2(uuid, StorageBus_IDE, 0, 1));
     1036                    CHECK_ERROR(machine, AttachHardDisk(uuid, StorageBus_IDE, 0, 1));
    10371037                }
    10381038                else
    … …  
    10461046            if (strcmp(hdds[2], "none") == 0)
    10471047            {
    1048                 machine->DetachHardDisk2(StorageBus_IDE, 1, 1);
     1048                machine->DetachHardDisk(StorageBus_IDE, 1, 1);
    10491049            }
    10501050            else
    … …  
    10521052                /* first guess is that it's a UUID */
    10531053                Guid uuid(hdds[2]);
    1054                 ComPtr<IHardDisk2> hardDisk;
    1055                 rc = a->virtualBox->GetHardDisk2(uuid, hardDisk.asOutParam());
     1054                ComPtr<IHardDisk> hardDisk;
     1055                rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam());
    10561056                /* not successful? Then it must be a filename */
    10571057                if (!hardDisk)
    10581058                {
    1059                     CHECK_ERROR(a->virtualBox, FindHardDisk2(Bstr(hdds[2]), hardDisk.asOutParam()));
     1059                    CHECK_ERROR(a->virtualBox, FindHardDisk(Bstr(hdds[2]), hardDisk.asOutParam()));
    10601060                    if (FAILED(rc))
    10611061                    {
    10621062                        /* open the new hard disk object */
    1063                         CHECK_ERROR(a->virtualBox, OpenHardDisk2(Bstr(hdds[2]), hardDisk.asOutParam()));
     1063                        CHECK_ERROR(a->virtualBox, OpenHardDisk(Bstr(hdds[2]), hardDisk.asOutParam()));
    10641064                    }
    10651065                }
    … …  
    10671067                {
    10681068                    hardDisk->COMGETTER(Id)(uuid.asOutParam());
    1069                     CHECK_ERROR(machine, AttachHardDisk2(uuid, StorageBus_IDE, 1, 1));
     1069                    CHECK_ERROR(machine, AttachHardDisk(uuid, StorageBus_IDE, 1, 1));
    10701070                }
    10711071                else
    … …  
    12101210                    /* first assume it's a UUID */
    12111211                    Guid uuid(floppy);
    1212                     ComPtr<IFloppyImage2> floppyImage;
     1212                    ComPtr<IFloppyImage> floppyImage;
    12131213                    rc = a->virtualBox->GetFloppyImage(uuid, floppyImage.asOutParam());
    12141214                    if (FAILED(rc) || !floppyImage)
    … …  
    17471747                if (strcmp(hdds[i], "none") == 0)
    17481748                {
    1749                     machine->DetachHardDisk2(StorageBus_SATA, i-4, 0);
     1749                    machine->DetachHardDisk(StorageBus_SATA, i-4, 0);
    17501750                }
    17511751                else
    … …  
    17531753                    /* first guess is that it's a UUID */
    17541754                    Guid uuid(hdds[i]);
    1755                     ComPtr<IHardDisk2> hardDisk;
    1756                     rc = a->virtualBox->GetHardDisk2(uuid, hardDisk.asOutParam());
     1755                    ComPtr<IHardDisk> hardDisk;
     1756                    rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam());
    17571757                    /* not successful? Then it must be a filename */
    17581758                    if (!hardDisk)
    17591759                    {
    1760                         CHECK_ERROR(a->virtualBox, FindHardDisk2(Bstr(hdds[i]), hardDisk.asOutParam()));
     1760                        CHECK_ERROR(a->virtualBox, FindHardDisk(Bstr(hdds[i]), hardDisk.asOutParam()));
    17611761                        if (FAILED(rc))
    17621762                        {
    17631763                            /* open the new hard disk object */
    1764                             CHECK_ERROR(a->virtualBox, OpenHardDisk2(Bstr(hdds[i]), hardDisk.asOutParam()));
     1764                            CHECK_ERROR(a->virtualBox, OpenHardDisk(Bstr(hdds[i]), hardDisk.asOutParam()));
    17651765                        }
    17661766                    }
    … …  
    17681768                    {
    17691769                        hardDisk->COMGETTER(Id)(uuid.asOutParam());
    1770                         CHECK_ERROR(machine, AttachHardDisk2(uuid, StorageBus_SATA, i-4, 0));
     1770                        CHECK_ERROR(machine, AttachHardDisk(uuid, StorageBus_SATA, i-4, 0));
    17711771                    }
    17721772                    else
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