Changeset 6291 in vbox for trunk/src/VBox/Devices/Storage/DrvRawImage.cpp

Timestamp:

Jan 9, 2008 10:57:05 AM (17 years ago)

Author:

vboxsync

Message:

Big virtual disk changeset containing several modifications

• remove the always buggy translation setting and replace it with two sets of geometries, physical and logical
• complete vmdk creation (fixed/dynamic variants, both split in 2G chunks and single file)
• implemented VBoxHDD-new generic snapshot support, i.e. diff image creation and image merging (completely untested, I'm pretty sure there are bugs)
• assorted changes which generalize the VBoxHDD-new interfaces (both externally and internally)

File:

• trunk/src/VBox/Devices/Storage/DrvRawImage.cpp (modified) (5 diffs)

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

@@ -76 +76 @@
 static DECLCALLBACK(uint64_t) drvRawImageGetSize(PPDMIMEDIA pInterface);
 static DECLCALLBACK(int) drvRawImageGetUuid(PPDMIMEDIA pInterface, PRTUUID pUuid);
-static DECLCALLBACK(int) drvRawImageBiosGetGeometry(PPDMIMEDIA pInterface, uint32_t *pcCylinders, uint32_t *pcHeads, uint32_t *pcSectors);
-static DECLCALLBACK(int) drvRawImageBiosSetGeometry(PPDMIMEDIA pInterface, uint32_t cCylinders, uint32_t cHeads, uint32_t cSectors);
-static DECLCALLBACK(int) drvRawImageBiosGetTranslation(PPDMIMEDIA pInterface, PPDMBIOSTRANSLATION penmTranslation);
-static DECLCALLBACK(int) drvRawImageBiosSetTranslation(PPDMIMEDIA pInterface, PDMBIOSTRANSLATION enmTranslation);
+static DECLCALLBACK(int) drvRawImageBiosGetPCHSGeometry(PPDMIMEDIA pInterface, PPDMMEDIAGEOMETRY pPCHSGeometry);
+static DECLCALLBACK(int) drvRawImageBiosSetPCHSGeometry(PPDMIMEDIA pInterface, PCPDMMEDIAGEOMETRY pPCHSGeometry);
+static DECLCALLBACK(int) drvRawImageBiosGetLCHSGeometry(PPDMIMEDIA pInterface, PPDMMEDIAGEOMETRY pLCHSGeometry);
+static DECLCALLBACK(int) drvRawImageBiosSetLCHSGeometry(PPDMIMEDIA pInterface, PCPDMMEDIAGEOMETRY pLCHSGeometry);
 
 static DECLCALLBACK(void *) drvRawImageQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface);
@@ -114 +114 @@
     pData->IMedia.pfnGetUuid            = drvRawImageGetUuid;
     pData->IMedia.pfnIsReadOnly         = drvRawImageIsReadOnly;
-    pData->IMedia.pfnBiosGetGeometry    = drvRawImageBiosGetGeometry;
-    pData->IMedia.pfnBiosSetGeometry    = drvRawImageBiosSetGeometry;
-    pData->IMedia.pfnBiosGetTranslation = drvRawImageBiosGetTranslation;
-    pData->IMedia.pfnBiosSetTranslation = drvRawImageBiosSetTranslation;
+    pData->IMedia.pfnBiosGetPCHSGeometry = drvRawImageBiosGetPCHSGeometry;
+    pData->IMedia.pfnBiosSetPCHSGeometry = drvRawImageBiosSetPCHSGeometry;
+    pData->IMedia.pfnBiosGetLCHSGeometry = drvRawImageBiosGetLCHSGeometry;
+    pData->IMedia.pfnBiosSetLCHSGeometry = drvRawImageBiosSetLCHSGeometry;
 
     /*
@@ -207 +207 @@
 
 
-/** @copydoc PDMIMEDIA::pfnBiosGetGeometry */
-static DECLCALLBACK(int) drvRawImageBiosGetGeometry(PPDMIMEDIA pInterface, uint32_t *pcCylinders, uint32_t *pcHeads, uint32_t *pcSectors)
+/** @copydoc PDMIMEDIA::pfnBiosGetPCHSGeometry */
+static DECLCALLBACK(int) drvRawImageBiosGetPCHSGeometry(PPDMIMEDIA pInterface, PPDMMEDIAGEOMETRY pPCHSGeometry)
 {
     return VERR_NOT_IMPLEMENTED;
@@ -214 +214 @@
 
 
-/** @copydoc PDMIMEDIA::pfnBiosSetGeometry */
-static DECLCALLBACK(int) drvRawImageBiosSetGeometry(PPDMIMEDIA pInterface, uint32_t cCylinders, uint32_t cHeads, uint32_t cSectors)
+/** @copydoc PDMIMEDIA::pfnBiosSetPCHSGeometry */
+static DECLCALLBACK(int) drvRawImageBiosSetPCHSGeometry(PPDMIMEDIA pInterface, PCPDMMEDIAGEOMETRY pPCHSGeometry)
+{
+    return VERR_NOT_IMPLEMENTED;
+}
+
+
+/** @copydoc PDMIMEDIA::pfnBiosGetLCHSGeometry */
+static DECLCALLBACK(int) drvRawImageBiosGetLCHSGeometry(PPDMIMEDIA pInterface, PPDMMEDIAGEOMETRY pLCHSGeometry)
+{
+    return VERR_NOT_IMPLEMENTED;
+}
+
+
+/** @copydoc PDMIMEDIA::pfnBiosSetLCHSGeometry */
+static DECLCALLBACK(int) drvRawImageBiosSetLCHSGeometry(PPDMIMEDIA pInterface, PCPDMMEDIAGEOMETRY pLCHSGeometry)
 {
     return VERR_NOT_IMPLEMENTED;
@@ -319 +333 @@
     PDRVRAWIMAGE pData = PDMIMEDIA_2_DRVRAWIMAGE(pInterface);
     return pData->fReadOnly;
-}
-
-
-/**
- * Stub - operation not supported.
- *
- * @copydoc PDMIMEDIA::pfnBiosGetTranslation
- */
-static DECLCALLBACK(int) drvRawImageBiosGetTranslation(PPDMIMEDIA pInterface, PPDMBIOSTRANSLATION penmTranslation)
-{
-    NOREF(pInterface); NOREF(penmTranslation);
-    return VERR_NOT_IMPLEMENTED;
-}
-
-
-/**
- * Stub - operation not supported.
- *
- * @copydoc PDMIMEDIA::pfnBiosSetTranslation
- */
-static DECLCALLBACK(int) drvRawImageBiosSetTranslation(PPDMIMEDIA pInterface, PDMBIOSTRANSLATION enmTranslation)
-{
-    NOREF(pInterface); NOREF(enmTranslation);
-    return VERR_NOT_IMPLEMENTED;
 }