VirtualBox

Changeset 61012 in vbox for trunk


Ignore:
Timestamp:
May 17, 2016 6:30:33 PM (8 years ago)
Author:
vboxsync
Message:

Main/Appliance: fix regression (storage controller naming inconsistency) introduced by previous appliance change

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

    r61009 r61012  
    22812281 * @param hdc in: the HardDiskController structure to attach to.
    22822282 * @param ulAddressOnParent in: the AddressOnParent parameter from OVF.
    2283  * @param controllerName out: the name of the hard disk controller to attach to (e.g. "IDE Controller").
     2283 * @param controllerName out: the name of the hard disk controller to attach to (e.g. "IDE").
    22842284 * @param lControllerPort out: the channel (controller port) of the controller to attach to.
    22852285 * @param lDevice out: the device number to attach to.
     
    29452945        // one or two IDE controllers present in OVF: add one VirtualBox controller
    29462946        ComPtr<IStorageController> pController;
    2947         rc = pNewMachine->AddStorageController(Bstr("IDE Controller").raw(), StorageBus_IDE, pController.asOutParam());
     2947        rc = pNewMachine->AddStorageController(Bstr("IDE").raw(), StorageBus_IDE, pController.asOutParam());
    29482948        if (FAILED(rc)) throw rc;
    29492949
     
    29742974        if (hdcVBox == "AHCI")
    29752975        {
    2976             rc = pNewMachine->AddStorageController(Bstr("SATA Controller").raw(),
     2976            rc = pNewMachine->AddStorageController(Bstr("SATA").raw(),
    29772977                                                   StorageBus_SATA,
    29782978                                                   pController.asOutParam());
     
    29942994    {
    29952995        ComPtr<IStorageController> pController;
    2996         Utf8Str strName("SCSI Controller");
     2996        Utf8Str strName("SCSI");
    29972997        StorageBus_T busType = StorageBus_SCSI;
    29982998        StorageControllerType_T controllerType;
     
    30033003        {
    30043004            // OVF treats LsiLogicSas as a SCSI controller but VBox considers it a class of its own
    3005             strName = "SAS Controller";
     3005            strName = "SAS";
    30063006            busType = StorageBus_SAS;
    30073007            controllerType = StorageControllerType_LsiLogicSas;
     
    30293029    {
    30303030        ComPtr<IStorageController> pController;
    3031         rc = pNewMachine->AddStorageController(Bstr(L"SAS Controller").raw(),
     3031        rc = pNewMachine->AddStorageController(Bstr(L"SAS").raw(),
    30323032                                               StorageBus_SAS,
    30333033                                               pController.asOutParam());
     
    30763076            {
    30773077                ComPtr<IStorageController> pController;
    3078                 rc = sMachine->AddStorageController(Bstr("Floppy Controller").raw(),
     3078                rc = sMachine->AddStorageController(Bstr("Floppy").raw(),
    30793079                                                    StorageBus_Floppy,
    30803080                                                    pController.asOutParam());
Note: See TracChangeset for help on using the changeset viewer.

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