Changeset 98041 in vbox

Timestamp:

Jan 10, 2023 6:07:22 PM (23 months ago)

Author:

vboxsync

Message:

Main/Medium: Can't use raw disk VMDK for differencing images and also avoid it for OVF import and export. In VirtualBox 7 the flag is now a lot more meaningful (due to the API integration) and would propagate to differencing images. Likewise for the VMDK/ESX variant which also isn't suitable for diffs.

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -6944 +6944 @@
                                          false /* fMoveByRename */,
                                          0 /* cbSize */,
-                                         aVariant & ~(MediumVariant_NoCreateDir | MediumVariant_Formatted),
+                                         aVariant & ~(MediumVariant_NoCreateDir | MediumVariant_Formatted | MediumVariant_VmdkESX | MediumVariant_VmdkRawDisk),
                                          NULL /* pDstUuid */,
                                          VD_OPEN_FLAGS_NORMAL | VD_OPEN_FLAGS_SEQUENTIAL,
@@ -9062 +9062 @@
                                targetFormat.c_str(),
                                targetLocation.c_str(),
-                                 (task.mVariant & ~(MediumVariant_NoCreateDir | MediumVariant_Formatted | MediumVariant_VmdkESX))
+                                 (task.mVariant & ~(MediumVariant_NoCreateDir | MediumVariant_Formatted | MediumVariant_VmdkESX | MediumVariant_RawDisk))
                                | VD_IMAGE_FLAGS_DIFF,
                                NULL,
@@ -9777 +9777 @@
                                  false /* fMoveByRename */,
                                  (uint64_t) task.mTargetLogicalSize /* cbSize */,
-                                 task.mVariant & ~(MediumVariant_NoCreateDir | MediumVariant_Formatted),
+                                 task.mVariant & ~(MediumVariant_NoCreateDir | MediumVariant_Formatted | MediumVariant_VmdkESX | MediumVariant_VmdkRawDisk),
                                  targetId.raw(),
                                  VD_OPEN_FLAGS_NORMAL | m->uOpenFlagsDef,
@@ -9795 +9795 @@
                                    task.midxSrcImageSame,
                                    task.midxDstImageSame,
-                                   task.mVariant & ~(MediumVariant_NoCreateDir | MediumVariant_Formatted),
+                                   task.mVariant & ~(MediumVariant_NoCreateDir | MediumVariant_Formatted | MediumVariant_VmdkESX | MediumVariant_VmdkRawDisk),
                                    targetId.raw(),
                                    VD_OPEN_FLAGS_NORMAL | m->uOpenFlagsDef,
@@ -10712 +10712 @@
                              false /* fMoveByRename */,
                              0 /* cbSize */,
-                             task.mVariant & ~(MediumVariant_NoCreateDir | MediumVariant_Formatted),
+                             task.mVariant & ~(MediumVariant_NoCreateDir | MediumVariant_Formatted | MediumVariant_VmdkESX | MediumVariant_VmdkRawDisk),
                              targetId.raw(),
                              VD_OPEN_FLAGS_NORMAL,