Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h (revision 35238) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h (revision 35239) @@ -215,4 +215,10 @@ /* VBoxManageDisk.cpp */ +HRESULT findMedium(HandlerArg *a, const char *pszFilenameOrUuid, + DeviceType_T enmDevType, bool fSilent, + ComPtr &pMedium); +HRESULT findOrOpenMedium(HandlerArg *a, const char *pszFilenameOrUuid, + DeviceType_T enmDevType, ComPtr &pMedium, + bool *pfWasUnknown); int handleCreateHardDisk(HandlerArg *a); int handleModifyHardDisk(HandlerArg *a); Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp (revision 35238) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp (revision 35239) @@ -149,4 +149,95 @@ } +HRESULT findMedium(HandlerArg *a, const char *pszFilenameOrUuid, + DeviceType_T enmDevType, bool fSilent, + ComPtr &pMedium) +{ + HRESULT rc; + Guid id(pszFilenameOrUuid); + char szFilenameAbs[RTPATH_MAX] = ""; + + /* If it is no UUID, convert the filename to an absolute one. */ + if (id.isEmpty()) + { + int irc = RTPathAbs(pszFilenameOrUuid, szFilenameAbs, sizeof(szFilenameAbs)); + if (RT_FAILURE(irc)) + { + if (!fSilent) + RTMsgError("Cannot convert filename \"%s\" to absolute path", pszFilenameOrUuid); + return E_FAIL; + } + pszFilenameOrUuid = szFilenameAbs; + } + + if (!fSilent) + CHECK_ERROR(a->virtualBox, FindMedium(Bstr(pszFilenameOrUuid).raw(), + enmDevType, pMedium.asOutParam())); + else + rc = a->virtualBox->FindMedium(Bstr(pszFilenameOrUuid).raw(), + enmDevType, pMedium.asOutParam()); + return rc; +} + +HRESULT findOrOpenMedium(HandlerArg *a, const char *pszFilenameOrUuid, + DeviceType_T enmDevType, ComPtr &pMedium, + bool *pfWasUnknown) +{ + HRESULT rc; + bool fWasUnknown = false; + Guid id(pszFilenameOrUuid); + char szFilenameAbs[RTPATH_MAX] = ""; + + /* If it is no UUID, convert the filename to an absolute one. */ + if (id.isEmpty()) + { + int irc = RTPathAbs(pszFilenameOrUuid, szFilenameAbs, sizeof(szFilenameAbs)); + if (RT_FAILURE(irc)) + { + RTMsgError("Cannot convert filename \"%s\" to absolute path", pszFilenameOrUuid); + return E_FAIL; + } + pszFilenameOrUuid = szFilenameAbs; + } + + rc = a->virtualBox->FindMedium(Bstr(pszFilenameOrUuid).raw(), enmDevType, + pMedium.asOutParam()); + /* If the medium is unknown try to open it. */ + if (!pMedium) + { + CHECK_ERROR(a->virtualBox, OpenMedium(Bstr(pszFilenameOrUuid).raw(), + enmDevType, AccessMode_ReadWrite, + pMedium.asOutParam())); + if (SUCCEEDED(rc)) + fWasUnknown = true; + } + if (RT_VALID_PTR(pfWasUnknown)) + *pfWasUnknown = fWasUnknown; + return rc; +} + +static HRESULT createHardDisk(HandlerArg *a, const char *pszFormat, + const char *pszFilename, ComPtr &pMedium) +{ + HRESULT rc; + char szFilenameAbs[RTPATH_MAX] = ""; + + /** @todo laziness shortcut. should really check the MediumFormatCapabilities */ + if (RTStrICmp(pszFormat, "iSCSI")) + { + int irc = RTPathAbs(pszFilename, szFilenameAbs, sizeof(szFilenameAbs)); + if (RT_FAILURE(irc)) + { + RTMsgError("Cannot convert filename \"%s\" to absolute path", pszFilename); + return E_FAIL; + } + pszFilename = szFilenameAbs; + } + + CHECK_ERROR(a->virtualBox, CreateHardDisk(Bstr(pszFormat).raw(), + Bstr(pszFilename).raw(), + pMedium.asOutParam())); + return rc; +} + static const RTGETOPTDEF g_aCreateHardDiskOptions[] = { @@ -168,7 +259,7 @@ HRESULT rc; int vrc; - Bstr filename; + const char *filename = NULL; uint64_t size = 0; - Bstr format = "VDI"; + const char *format = "VDI"; MediumVariant_T DiskVariant = MediumVariant_Standard; @@ -234,9 +325,11 @@ /* check the outcome */ - if ( filename.isEmpty() + if ( !filename + || !*filename || size == 0) return errorSyntax(USAGE_CREATEHD, "Parameters --filename and --size are required"); /* check for filename extension */ + /** @todo use IMediumFormat to cover all extensions generically */ Utf8Str strName(filename); if (!RTPathHaveExt(strName.c_str())) @@ -249,10 +342,9 @@ else strName.append(".vdi"); - filename = Bstr(strName); + filename = strName.c_str(); } ComPtr hardDisk; - CHECK_ERROR(a->virtualBox, CreateHardDisk(format.raw(), filename.raw(), - hardDisk.asOutParam())); + rc = createHardDisk(a, format, filename, hardDisk); if (SUCCEEDED(rc) && hardDisk) { @@ -381,38 +473,8 @@ * may be opened on demand. */ if (fModifyDiskType || fModifyAutoReset) - { - CHECK_ERROR(a->virtualBox, FindMedium(Bstr(FilenameOrUuid).raw(), - DeviceType_HardDisk, - hardDisk.asOutParam())); - } + rc = findMedium(a, FilenameOrUuid, DeviceType_HardDisk, false /* fSilent */, hardDisk); else - { - rc = a->virtualBox->FindMedium(Bstr(FilenameOrUuid).raw(), - DeviceType_HardDisk, - hardDisk.asOutParam()); - /* the hard disk image might not be registered */ - if (!hardDisk) - { - unknown = true; - rc = a->virtualBox->OpenMedium(Bstr(FilenameOrUuid).raw(), - DeviceType_HardDisk, - AccessMode_ReadWrite, - hardDisk.asOutParam()); - if (rc == VBOX_E_FILE_ERROR) - { - char szFilenameAbs[RTPATH_MAX] = ""; - int irc = RTPathAbs(FilenameOrUuid, szFilenameAbs, sizeof(szFilenameAbs)); - if (RT_FAILURE(irc)) - { - RTMsgError("Cannot convert filename \"%s\" to absolute path", FilenameOrUuid); - return 1; - } - CHECK_ERROR(a->virtualBox, OpenMedium(Bstr(szFilenameAbs).raw(), - DeviceType_HardDisk, - AccessMode_ReadWrite, - hardDisk.asOutParam())); - } - } - } + rc = findOrOpenMedium(a, FilenameOrUuid, DeviceType_HardDisk, + hardDisk, &unknown); if (FAILED(rc)) return 1; @@ -492,5 +554,6 @@ HRESULT rc; int vrc; - Bstr src, dst; + const char *pszSrc = NULL; + const char *pszDst = NULL; Bstr format; MediumVariant_T DiskVariant = MediumVariant_Standard; @@ -530,8 +593,8 @@ case VINF_GETOPT_NOT_OPTION: - if (src.isEmpty()) - src = ValueUnion.psz; - else if (dst.isEmpty()) - dst = ValueUnion.psz; + if (!pszSrc) + pszSrc = ValueUnion.psz; + else if (!pszDst) + pszDst = ValueUnion.psz; else return errorSyntax(USAGE_CLONEHD, "Invalid parameter '%s'", ValueUnion.psz); @@ -555,7 +618,7 @@ } - if (src.isEmpty()) + if (!pszSrc) return errorSyntax(USAGE_CLONEHD, "Mandatory UUID or input file parameter missing"); - if (dst.isEmpty()) + if (!pszDst) return errorSyntax(USAGE_CLONEHD, "Mandatory output file parameter missing"); if (fExisting && (!format.isEmpty() || DiskVariant != MediumType_Normal)) @@ -567,34 +630,7 @@ bool fDstUnknown = false; - rc = a->virtualBox->FindMedium(src.raw(), DeviceType_HardDisk, - srcDisk.asOutParam()); - /* no? well, then it's an unknown image */ - if (FAILED (rc)) - { - rc = a->virtualBox->OpenMedium(src.raw(), DeviceType_HardDisk, - AccessMode_ReadWrite, - srcDisk.asOutParam()); - if (rc == VBOX_E_FILE_ERROR) - { - char szFilenameAbs[RTPATH_MAX] = ""; - int irc = RTPathAbs(Utf8Str(src).c_str(), szFilenameAbs, sizeof(szFilenameAbs)); - if (RT_FAILURE(irc)) - { - RTMsgError("Cannot convert filename \"%s\" to absolute path", Utf8Str(src).c_str()); - return 1; - } - CHECK_ERROR(a->virtualBox, OpenMedium(Bstr(szFilenameAbs).raw(), - DeviceType_HardDisk, - AccessMode_ReadWrite, - srcDisk.asOutParam())); - } - else if (SUCCEEDED(rc)) - fSrcUnknown = true; - else - { - com::GluePrintRCMessage(rc); - return 1; - } - } + rc = findOrOpenMedium(a, pszSrc, DeviceType_HardDisk, srcDisk, &fSrcUnknown); + if (FAILED(rc)) + return 1; do @@ -603,43 +639,12 @@ if (fExisting) { - rc = a->virtualBox->FindMedium(dst.raw(), DeviceType_HardDisk, - dstDisk.asOutParam()); - /* no? well, then it's an unknown image */ + rc = findOrOpenMedium(a, pszDst, DeviceType_HardDisk, dstDisk, &fDstUnknown); if (FAILED(rc)) - { - rc = a->virtualBox->OpenMedium(dst.raw(), DeviceType_HardDisk, - AccessMode_ReadWrite, - dstDisk.asOutParam()); - if (rc == VBOX_E_FILE_ERROR) - { - char szFilenameAbs[RTPATH_MAX] = ""; - int irc = RTPathAbs(Utf8Str(dst).c_str(), szFilenameAbs, sizeof(szFilenameAbs)); - if (RT_FAILURE(irc)) - { - RTMsgError("Cannot convert filename \"%s\" to absolute path", Utf8Str(dst).c_str()); - return 1; - } - CHECK_ERROR_BREAK(a->virtualBox, OpenMedium(Bstr(szFilenameAbs).raw(), - DeviceType_HardDisk, - AccessMode_ReadWrite, - dstDisk.asOutParam())); - } - else if (FAILED(rc)) - { - com::GluePrintRCMessage(rc); - break; - } - - /* If the image wasn't opened before, close it at the end. */ - if (SUCCEEDED(rc)) - fDstUnknown = true; - } - if (SUCCEEDED(rc)) - { - /* Perform accessibility check now. */ - MediumState_T state; - CHECK_ERROR_BREAK(dstDisk, RefreshState(&state)); - CHECK_ERROR_BREAK(dstDisk, COMGETTER(Format)(format.asOutParam())); - } + break; + + /* Perform accessibility check now. */ + MediumState_T state; + CHECK_ERROR_BREAK(dstDisk, RefreshState(&state)); + CHECK_ERROR_BREAK(dstDisk, COMGETTER(Format)(format.asOutParam())); } else @@ -648,7 +653,7 @@ if (format.isEmpty()) CHECK_ERROR_BREAK(srcDisk, COMGETTER(Format)(format.asOutParam())); - CHECK_ERROR_BREAK(a->virtualBox, CreateHardDisk(format.raw(), - dst.raw(), - dstDisk.asOutParam())); + rc = createHardDisk(a, Utf8Str(format).c_str(), pszDst, dstDisk); + if (FAILED(rc)) + break; } @@ -919,37 +924,8 @@ ComPtr hardDisk; bool unknown = false; - /* first guess is that it's a UUID */ - rc = a->virtualBox->FindMedium(Bstr(FilenameOrUuid).raw(), - DeviceType_HardDisk, - hardDisk.asOutParam()); - /* no? well, then it's an unknown image */ + + rc = findOrOpenMedium(a, FilenameOrUuid, DeviceType_HardDisk, hardDisk, &unknown); if (FAILED(rc)) - { - rc = a->virtualBox->OpenMedium(Bstr(FilenameOrUuid).raw(), - DeviceType_HardDisk, - AccessMode_ReadWrite, - hardDisk.asOutParam()); - if (rc == VBOX_E_FILE_ERROR) - { - char szFilenameAbs[RTPATH_MAX] = ""; - int vrc = RTPathAbs(FilenameOrUuid, szFilenameAbs, sizeof(szFilenameAbs)); - if (RT_FAILURE(vrc)) - { - RTMsgError("Cannot convert filename \"%s\" to absolute path", FilenameOrUuid); - return 1; - } - CHECK_ERROR(a->virtualBox, OpenMedium(Bstr(szFilenameAbs).raw(), - DeviceType_HardDisk, - AccessMode_ReadWrite, - hardDisk.asOutParam())); - } - else if (SUCCEEDED(rc)) - unknown = true; - else - { - com::GluePrintRCMessage(rc); - return 1; - } - } + return 1; do @@ -1177,15 +1153,9 @@ if (cmd == CMD_DISK) - CHECK_ERROR(a->virtualBox, FindMedium(Bstr(FilenameOrUuid).raw(), - DeviceType_HardDisk, - medium.asOutParam())); + rc = findMedium(a, FilenameOrUuid, DeviceType_HardDisk, false /* fSilent */, medium); else if (cmd == CMD_DVD) - CHECK_ERROR(a->virtualBox, FindMedium(Bstr(FilenameOrUuid).raw(), - DeviceType_DVD, - medium.asOutParam())); + rc = findMedium(a, FilenameOrUuid, DeviceType_DVD, false /* fSilent */, medium); else if (cmd == CMD_FLOPPY) - CHECK_ERROR(a->virtualBox, FindMedium(Bstr(FilenameOrUuid).raw(), - DeviceType_Floppy, - medium.asOutParam())); + rc = findMedium(a, FilenameOrUuid, DeviceType_Floppy, false /* fSilent */, medium); if (SUCCEEDED(rc) && medium) Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 35238) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 35239) @@ -683,16 +683,8 @@ { ComPtr hardDisk; - rc = a->virtualBox->FindMedium(Bstr(ValueUnion.psz).raw(), - DeviceType_HardDisk, - hardDisk.asOutParam()); + rc = findOrOpenMedium(a, ValueUnion.psz, DeviceType_HardDisk, + hardDisk, NULL); if (FAILED(rc)) - { - /* open the new hard disk object */ - CHECK_ERROR(a->virtualBox, - OpenMedium(Bstr(ValueUnion.psz).raw(), - DeviceType_HardDisk, - AccessMode_ReadWrite, - hardDisk.asOutParam())); - } + break; if (hardDisk) { @@ -785,19 +777,9 @@ else { - /* first guess is that it's a UUID */ ComPtr hardDisk; - rc = a->virtualBox->FindMedium(Bstr(ValueUnion.psz).raw(), - DeviceType_HardDisk, - hardDisk.asOutParam()); - /* not successful? Then it must be a filename */ + rc = findOrOpenMedium(a, ValueUnion.psz, DeviceType_HardDisk, + hardDisk, NULL); if (FAILED(rc)) - { - /* open the new hard disk object */ - CHECK_ERROR(a->virtualBox, - OpenMedium(Bstr(ValueUnion.psz).raw(), - DeviceType_HardDisk, - AccessMode_ReadWrite, - hardDisk.asOutParam())); - } + break; if (hardDisk) { @@ -923,18 +905,8 @@ else { - /* first assume it's a UUID */ - rc = a->virtualBox->FindMedium(Bstr(ValueUnion.psz).raw(), - DeviceType_DVD, - dvdMedium.asOutParam()); - if (FAILED(rc) || !dvdMedium) - { - /* not registered, do that on the fly */ - Bstr emptyUUID; - CHECK_ERROR(a->virtualBox, - OpenMedium(Bstr(ValueUnion.psz).raw(), - DeviceType_DVD, - AccessMode_ReadWrite, - dvdMedium.asOutParam())); - } + rc = findOrOpenMedium(a, ValueUnion.psz, DeviceType_DVD, + dvdMedium, NULL); + if (FAILED(rc)) + break; if (!dvdMedium) { @@ -996,18 +968,8 @@ else { - /* first assume it's a UUID */ - rc = a->virtualBox->FindMedium(Bstr(ValueUnion.psz).raw(), - DeviceType_Floppy, - floppyMedium.asOutParam()); - if (FAILED(rc) || !floppyMedium) - { - /* not registered, do that on the fly */ - Bstr emptyUUID; - CHECK_ERROR(a->virtualBox, - OpenMedium(Bstr(ValueUnion.psz).raw(), - DeviceType_Floppy, - AccessMode_ReadWrite, - floppyMedium.asOutParam())); - } + rc = findOrOpenMedium(a, ValueUnion.psz, DeviceType_Floppy, + floppyMedium, NULL); + if (FAILED(rc)) + break; if (!floppyMedium) { Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp (revision 35238) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp (revision 35239) @@ -395,7 +395,6 @@ ComPtr pExistingMedium; - rc = a->virtualBox->FindMedium(Bstr(pszMedium).raw(), - deviceType, - pExistingMedium.asOutParam()); + rc = findMedium(a, pszMedium, deviceType, true /* fSilent */, + pExistingMedium); if (pExistingMedium) { @@ -544,16 +543,6 @@ throw Utf8Str("Missing --medium argument"); - rc = a->virtualBox->FindMedium(bstrMedium.raw(), - devTypeRequested, - pMedium2Mount.asOutParam()); - if (FAILED(rc) || !pMedium2Mount) - { - /* not registered, do that on the fly */ - CHECK_ERROR(a->virtualBox, - OpenMedium(bstrMedium.raw(), - devTypeRequested, - AccessMode_ReadWrite, - pMedium2Mount.asOutParam())); - } + rc = findOrOpenMedium(a, pszMedium, devTypeRequested, + pMedium2Mount, NULL); if (!pMedium2Mount) throw Utf8StrFmt("Invalid UUID or filename \"%s\"", pszMedium);