Changeset 7152 in vbox

Timestamp:

Feb 26, 2008 5:17:10 PM (17 years ago)

Author:

vboxsync

Message:

Preparations for implementing a VBoxHDD-new based VDI backend. Clean up the existing stuff to not pollute the namespace.

Location:

trunk/src/VBox/Devices/Storage

Files:

• VBoxHDD.cpp (modified) (1 diff)
• VDICore.cpp (modified) (6 diffs)
• VDICore.h (modified) (10 diffs)

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

@@ -162 +162 @@
     LogFlow(("vdiFlush:\n"));
     PVDIDISK pData = PDMIMEDIA_2_VDIDISK(pInterface);
-    vdiFlushImage(pData->pLast);
+    VDIFlushImage(pData->pLast);
     int rc = VINF_SUCCESS;
     LogFlow(("vdiFlush: returns %Vrc\n", rc));

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

@@ -935 +935 @@
  * Flush the image file to disk.
  */
-void vdiFlushImage(PVDIIMAGEDESC pImage)
+void VDIFlushImage(PVDIIMAGEDESC pImage)
 {
     if (!pImage->fReadOnly)
@@ -959 +959 @@
     Assert(pImage->File != NIL_RTFILE);
 
-    vdiFlushImage(pImage);
+    VDIFlushImage(pImage);
     RTFileUnlock(pImage->File,
                  0,
@@ -3313 +3313 @@
 
     /* Flush last image changes if was r/w mode. */
-    vdiFlushImage(pImage);
+    VDIFlushImage(pImage);
 
     /* Change image locking. */
@@ -3367 +3367 @@
         if (VBOX_SUCCESS(rc))
         {
-            vdiFlushImage(pImage);
+            VDIFlushImage(pImage);
             rc = vdiChangeImageMode(pImage, true);
             AssertReleaseRC(rc);
@@ -3373 +3373 @@
     }
     else
-        vdiFlushImage(pImage);
+        VDIFlushImage(pImage);
 
     return rc;
@@ -3613 +3613 @@
 
     /* Flush last parent image changes if possible. */
-    vdiFlushImage(pDisk->pLast);
+    VDIFlushImage(pDisk->pLast);
 
     int rc = vdiCreateImage(pszFilename,

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

@@ -22 +22 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#ifndef VBOX_VDICORE_VD
 #include <VBox/VBoxHDD.h>
+#else /* VBOX_VDICORE_VD */
+#include <VBox/VBoxHDD-new.h>
+#endif /* VBOX_VDICORE_VD */
 #include <VBox/pdm.h>
 #include <VBox/mm.h>
@@ -264 +268 @@
 #define GET_MINOR_HEADER_VERSION(ph) (VDI_GET_VERSION_MINOR((ph)->uVersion))
 
+#ifdef VBOX_VDICORE_VD
+/** @name VDI image types
+ * @{ */
+typedef enum VDIIMAGETYPE
+{
+    /** Normal dynamically growing base image file. */
+    VDI_IMAGE_TYPE_NORMAL = 1,
+    /** Preallocated base image file of a fixed size. */
+    VDI_IMAGE_TYPE_FIXED,
+    /** Dynamically growing image file for undo/commit changes support. */
+    VDI_IMAGE_TYPE_UNDO,
+    /** Dynamically growing image file for differencing support. */
+    VDI_IMAGE_TYPE_DIFF,
+
+    /** First valid image type value. */
+    VDI_IMAGE_TYPE_FIRST  = VDI_IMAGE_TYPE_NORMAL,
+    /** Last valid image type value. */
+    VDI_IMAGE_TYPE_LAST   = VDI_IMAGE_TYPE_DIFF
+} VDIIMAGETYPE;
+/** Pointer to VDI image type. */
+typedef VDIIMAGETYPE *PVDIIMAGETYPE;
+/** @} */
+#endif /* VBOX_VDICORE_VD */
 
 /*******************************************************************************
@@ -451 +478 @@
 }
 
+#ifndef VBOX_VDICORE_VD
 /**
  * Default image block size, may be changed by setBlockSize/getBlockSize.
@@ -457 +485 @@
  */
 #define VDI_IMAGE_DEFAULT_BLOCK_SIZE            _1M
-
+#endif /* !VBOX_VDICORE_VD */
+
+#ifndef VBOX_VDICORE_VD
 /**
  * fModified bit flags.
@@ -464 +494 @@
 #define VDI_IMAGE_MODIFIED_FIRST                RT_BIT(1)
 #define VDI_IMAGE_MODIFIED_DISABLE_UUID_UPDATE  RT_BIT(2)
+#endif /* !VBOX_VDICORE_VD */
 
 /**
@@ -470 +501 @@
 typedef struct VDIIMAGEDESC
 {
+#ifndef VBOX_VDICORE_VD
     /** Link to parent image descriptor, if any. */
     struct VDIIMAGEDESC    *pPrev;
     /** Link to child image descriptor, if any. */
     struct VDIIMAGEDESC    *pNext;
+#endif /* !VBOX_VDICORE_VD */
     /** File handle. */
     RTFILE                  File;
+#ifndef VBOX_VDICORE_VD
     /** True if the image is operating in readonly mode. */
     bool                    fReadOnly;
     /** Image open flags, VDI_OPEN_FLAGS_*. */
     unsigned                fOpen;
+#else /* VBOX_VDICORE_VD */
+    /** Image open flags, VD__OPEN_FLAGS_*. */
+    unsigned                uOpenFlags;
+#endif /* VBOX_VDICORE_VD */
     /** Image pre-header. */
     VDIPREHEADER            PreHeader;
@@ -486 +524 @@
     /** Pointer to a block array. */
     PVDIIMAGEBLOCKPOINTER   paBlocks;
+#ifndef VBOX_VDICORE_VD
     /** fFlags copy from image header, for speed optimization. */
     unsigned                fFlags;
+#else /* VBOX_VDICORE_VD */
+    /** fFlags copy from image header, for speed optimization. */
+    unsigned                uImageFlags;
+#endif /* VBOX_VDICORE_VD */
     /** Start offset of block array in image file, here for speed optimization. */
     unsigned                offStartBlocks;
@@ -502 +545 @@
     /** Image is modified flags (VDI_IMAGE_MODIFIED*). */
     unsigned                fModified;
+#ifndef VBOX_VDICORE_VD
     /** Container filename. (UTF-8)
      * @todo Make this variable length to save a bunch of bytes. (low prio) */
     char                    szFilename[RTPATH_MAX];
+#else /* !VBOX_VDICORE_VD */
+    /** Container filename. (UTF-8) */
+    const char             *pszFilename;
+    /** Physical geometry of this image (never actually stored). */
+    PDMMEDIAGEOMETRY        PCHSGeometry;
+    /** Error callback. */
+    PFNVDERROR              pfnError;
+    /** Opaque data for error callback. */
+    void                   *pvErrorUser;
+#endif /* !VBOX_VDICORE_VD */
 } VDIIMAGEDESC, *PVDIIMAGEDESC;
 
+#ifndef VBOX_VDICORE_VD
 /**
  * Default work buffer size, may be changed by setBufferSize() method.
@@ -513 +568 @@
  */
 #define VDIDISK_DEFAULT_BUFFER_SIZE   (VDI_IMAGE_DEFAULT_BLOCK_SIZE)
+#endif /* !VBOX_VDICORE_VD */
 
 /** VDIDISK Signature. */
@@ -562 +618 @@
 __BEGIN_DECLS
 
+#ifndef VBOX_VDICORE_VD
 VBOXDDU_DECL(void) vdiInitVDIDisk(PVDIDISK pDisk);
-VBOXDDU_DECL(void) vdiFlushImage(PVDIIMAGEDESC pImage);
+VBOXDDU_DECL(void) VDIFlushImage(PVDIIMAGEDESC pImage);
 VBOXDDU_DECL(int)  vdiChangeImageMode(PVDIIMAGEDESC pImage, bool fReadOnly);
+#endif /* !VBOX_VDICORE_VD */
 
 __END_DECLS