Changeset 10781 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Jul 21, 2008 2:45:28 PM (16 years ago)

Author:

vboxsync

Message:

Fix incorrect image flags handling - the values in the image and used by VBoxHDD-new are not identical.

Location:

trunk/src/VBox/Devices/Storage

Files:

• VDICore.h (modified) (2 diffs)
• VDIHDDCore.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Storage/VDICore.h

@@ -310 +310 @@
 }
 
+#ifdef VBOX_VDICORE_VD
+DECLINLINE(unsigned) getImageFlags(PVDIHEADER ph)
+{
+    switch (GET_MAJOR_HEADER_VERSION(ph))
+    {
+        case 0:
+            /* VDI image flag conversion to VD image flags. */
+            return ph->u.v0.fFlags << 8;
+        case 1:
+            /* VDI image flag conversion to VD image flags. */
+            return ph->u.v1.fFlags << 8;
+    }
+    AssertFailed();
+    return 0;
+}
+#else /* !VBOX_VDICORE_VD */
 DECLINLINE(unsigned) getImageFlags(PVDIHEADER ph)
 {
@@ -320 +336 @@
     return 0;
 }
+#endif /* !VBOX_VDICORE_VD */
 
 DECLINLINE(char *) getImageComment(PVDIHEADER ph)

trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp

@@ -129 +129 @@
                                        ? VDI_IMAGE_TYPE_NORMAL
                                        : VDI_IMAGE_TYPE_DIFF);
-    pHeader->u.v1.fFlags = uImageFlags;
+    pHeader->u.v1.fFlags = (uImageFlags & VD_VDI_IMAGE_FLAGS_ZERO_EXPAND) ? 1 : 0;
 #ifdef VBOX_STRICT
     char achZero[VDI_IMAGE_COMMENT_SIZE] = {0};
@@ -1319 +1319 @@
 
     if (pImage)
-        uImageFlags = getImageFlags(&pImage->Header);
+        uImageFlags = pImage->uImageFlags;
     else
         uImageFlags = 0;