VirtualBox

儲存庫 vbox 的更動 50181


忽略:
時間撮記:
2014-1-23 下午03:30:40 (11 年 以前)
作者:
vboxsync
訊息:

ApplianceImplImport.cpp: Must use ErrorInfoKeepers to perserve error information when bailing out on failure. Some more logging.

檔案:
修改 1 筆資料

圖例:

未更動
新增
刪除
  • trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

    r49951 r50181  
    14001400
    14011401/**
    1402  * Actual worker code for importing OVF data into VirtualBox. This is called from Appliance::taskThreadImportOrExport()
    1403  * and therefore runs on the OVF import worker thread. This creates one or more new machines according to the
    1404  * VirtualSystemScription instances created by Appliance::Interpret().
     1402 * Actual worker code for importing OVF data into VirtualBox.
     1403 *
     1404 * This is called from Appliance::taskThreadImportOrExport() and therefore runs
     1405 * on the OVF import worker thread. This creates one or more new machines
     1406 * according to the VirtualSystemScription instances created by
     1407 * Appliance::Interpret().
    14051408 *
    14061409 * This runs in three contexts:
     
    14141417 *    called Appliance::i_importS3(), which called Appliance::i_importImpl(), which then called this again.
    14151418 *
    1416  * @param pTask
    1417  * @return
     1419 * @param   pTask       The OVF task data.
     1420 * @return  COM status code.
    14181421 */
    14191422HRESULT Appliance::i_importFS(TaskOVF *pTask)
     
    14481451         * machines and disks we've created */
    14491452        writeLock.release();
     1453        ErrorInfoKeeper eik;
    14501454        for (list<Guid>::iterator itID = m->llGuidsMachinesCreated.begin();
    14511455             itID != m->llGuidsMachinesCreated.end();
     
    15721576         */
    15731577        {
     1578            ErrorInfoKeeper eik; /* paranoia */
    15741579            list< ComObjPtr<VirtualSystemDescription> >::const_iterator itvsd;
    15751580            /* Iterate through all virtual systems of that appliance */
     
    25602565                                       PSHASTORAGE pStorage)
    25612566{
     2567    LogFlowFuncEnter();
    25622568    HRESULT rc;
    25632569
     
    30003006        try
    30013007        {
     3008#ifdef LOG_ENABLED
     3009            if (LogIsEnabled())
     3010            {
     3011                size_t i = 0;
     3012                for (list<VirtualSystemDescriptionEntry*>::const_iterator itHD = avsdeHDs.begin(); itHD != avsdeHDs.end(); ++itHD, i++)
     3013                    Log(("avsdeHDs[%zu]: strRef=%s\n", i, (*itHD)->strRef.c_str()));
     3014            }
     3015#endif
     3016
    30023017            // to attach things we need to open a session for the new machine
    30033018            rc = pNewMachine->LockMachine(stack.pSession, LockType_Write);
     
    30223037
    30233038                VirtualSystemDescriptionEntry *vsdeTargetHD = 0;
     3039                Log(("diCurrent.strDiskId=%s\n", diCurrent.strDiskId.c_str()));
    30243040
    30253041                /*
     
    31353151                                {
    31363152                                    /*
    3137  -                                   * in this case it's an error because something wrong with OVF description file.
     3153                                     * in this case it's an error because something wrong with OVF description file.
    31383154                                     * May be VB imports OVA package with wrong file sequence inside the archive.
    31393155                                     */
     
    32903306        }
    32913307    }
     3308    LogFlowFuncLeave();
    32923309}
    32933310
     
    33273344                                    PSHASTORAGE pStorage)
    33283345{
     3346    LogFlowFuncEnter();
    33293347    Assert(vsdescThis->m->pConfig);
    33303348
     
    38243842    if (FAILED(rc)) throw rc;
    38253843    m->llGuidsMachinesCreated.push_back(Guid(bstrNewMachineId));
     3844
     3845    LogFlowFuncLeave();
    38263846}
    38273847
     
    38893909        stack.strMachineFolder = bstrMachineFilename;
    38903910        stack.strMachineFolder.stripFilename();
     3911        LogFunc(("i=%zu strName=%s bstrMachineFilename=%ls\n", i, stack.strNameVBox.c_str(), bstrMachineFilename.raw()));
    38913912
    38923913        // guest OS type
注意: 瀏覽 TracChangeset 來幫助您使用更動檢視器

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