儲存庫 vbox 的更動 66997

時間撮記:

2017-5-22 上午08:38:38 (8 年 以前)

作者:

vboxsync

訊息:

Frontends/VBoxManage: Use the default disk image format if the source medium format can't create images

檔案:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp (修改) (1 筆差異)

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

@@ -942 +942 @@
         else
         {
-            /* use the format of the source medium if unspecified */
+            /*
+             * In case the format is unspecified check that the source medium supports
+             * image creation and use the same format for the destination image.
+             * Use the default image format if it is not supported.
+             */
             if (format.isEmpty())
-                CHECK_ERROR_BREAK(pSrcMedium, COMGETTER(Format)(format.asOutParam()));
+            {
+                ComPtr<IMediumFormat> pMediumFmt;
+                com::SafeArray<MediumFormatCapabilities_T> l_caps;
+                CHECK_ERROR_BREAK(pSrcMedium, COMGETTER(MediumFormat)(pMediumFmt.asOutParam()));
+                CHECK_ERROR_BREAK(pMediumFmt, COMGETTER(Capabilities)(ComSafeArrayAsOutParam(l_caps)));
+                ULONG caps=0;
+                for (size_t i = 0; i < l_caps.size(); i++)
+                    caps |= l_caps[i];
+                if (caps & (  MediumFormatCapabilities_CreateDynamic
+                            | MediumFormatCapabilities_CreateFixed))
+                    CHECK_ERROR_BREAK(pMediumFmt, COMGETTER(Id)(format.asOutParam()));
+            }
             Utf8Str strFormat(format);
             if (cmd == CMD_DISK)