Changeset 24439 in vbox for trunk/src

Timestamp:

Nov 6, 2009 1:16:47 PM (15 years ago)

Author:

vboxsync

Message:

Storage/VBoxHDD: tweak PCHS handling in VDCopy (contributed by Huihong Luo)

File:

• trunk/src/VBox/Devices/Storage/VBoxHDD.cpp (modified) (2 diffs)

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

@@ -2244 +2244 @@
                     uImageFlags |= VD_IMAGE_FLAGS_FIXED;
 
+                /* Fix broken PCHS geometry. Can happen for two reasons: either
+                 * the backend mixes up PCHS and LCHS, or the application used
+                 * to create the source image has put garbage in it. */
+                /** @todo double-check if the VHD backend correctly handles
+                 * PCHS and LCHS geometry. also reconsider our current paranoia
+                 * level when it comes to geometry settings here and in the
+                 * backends. */
+                if (PCHSGeometryFrom.cHeads > 16 || PCHSGeometryFrom.cSectors > 63)
+                {
+                    Assert(RT_MIN(cbSize / 512 / 16 / 63, 16383) - (uint32_t)RT_MIN(cbSize / 512 / 16 / 63, 16383));
+                    PCHSGeometryFrom.cCylinders = (uint32_t)RT_MIN(cbSize / 512 / 16 / 63, 16383);
+                    PCHSGeometryFrom.cHeads = 16;
+                    PCHSGeometryFrom.cSectors = 63;
+                }
+
                 rc = VDCreateBase(pDiskTo, pszBackend, pszFilename, cbSize,
                                   uImageFlags, szComment,
@@ -2327 +2342 @@
         if (RT_SUCCESS(rc))
         {
-            pImageTo->Backend->pfnSetModificationUuid(pImageTo->pvBackendData, &ImageModificationUuid);
+            /* Only set modification UUID if it is non-null, since the source
+             * backend might not provide a valid modification UUID. */
+            if (!RTUuidIsNull(&ImageModificationUuid))
+                pImageTo->Backend->pfnSetModificationUuid(pImageTo->pvBackendData, &ImageModificationUuid);
             /** @todo double-check this - it makes little sense to copy over the parent modification uuid,
              * as the destination image can have a totally different parent. */