Changeset 7281 in vbox for trunk/src/VBox

Timestamp:

Mar 4, 2008 4:24:09 PM (17 years ago)

Author:

vboxsync

Message:

Accept PCHS=0/0/0 when creating images. Will be fixed when the image is used first anyway.

File:

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

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

@@ -1089 +1089 @@
                        ("uImageFlags=%#x\n", uImageFlags),
                        rc = VERR_INVALID_PARAMETER);
+        /* The PCHS geometry fields may be 0 to leave it for later. */
         AssertMsgBreak(   VALID_PTR(pPCHSGeometry)
                        && pPCHSGeometry->cCylinders <= 16383
-                       && pPCHSGeometry->cCylinders != 0
                        && pPCHSGeometry->cHeads <= 16
-                       && pPCHSGeometry->cHeads != 0
-                       && pPCHSGeometry->cSectors <= 63
-                       && pPCHSGeometry->cSectors != 0,
+                       && pPCHSGeometry->cSectors <= 63,
                        ("pPCHSGeometry=%#p PCHS=%u/%u/%u\n", pPCHSGeometry,
                         pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads,
@@ -2030 +2028 @@
         AssertMsgBreak(   VALID_PTR(pPCHSGeometry)
                        && pPCHSGeometry->cCylinders <= 16383
-                       && pPCHSGeometry->cCylinders != 0
                        && pPCHSGeometry->cHeads <= 16
-                       && pPCHSGeometry->cHeads != 0
-                       && pPCHSGeometry->cSectors <= 63
-                       && pPCHSGeometry->cSectors != 0,
+                       && pPCHSGeometry->cSectors <= 63,
                        ("pPCHSGeometry=%#p PCHS=%u/%u/%u\n", pPCHSGeometry,
                         pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads,