Changeset 33524 in vbox for trunk/include

Timestamp:

Oct 27, 2010 4:44:37 PM (14 years ago)

Author:

vboxsync

Message:

Storage: Implement offical support for other disk types like DVD and floppy images. DMG images can be used now without hacks

Location:

trunk/include/VBox

Files:

• VBoxHDD-Plugin.h (modified) (3 diffs)
• VBoxHDD.h (modified) (5 diffs)
• settings.h (modified) (1 diff)

trunk/include/VBox/VBoxHDD-Plugin.h

@@ -61 +61 @@
 
     /**
-     * Pointer to a NULL-terminated array of strings, containing the supported
+     * Pointer to a NULL-terminated array, containing the supported
      * file extensions. Note that some backends do not work on files, so this
      * pointer may just contain NULL.
      */
-    const char * const *papszFileExtensions;
+    PCVDFILEEXTENSION paFileExtensions;
 
     /**
@@ -87 +87 @@
      * @param   pVDIfsDisk      Pointer to the per-disk VD interface list.
      * @param   pVDIfsImage     Pointer to the per-image VD interface list.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnCheckIfValid, (const char *pszFilename, PVDINTERFACE pVDIfsDisk, PVDINTERFACE pVDIfsImage));
+     * @param   penmType        Returns the supported device type on success.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnCheckIfValid, (const char *pszFilename, PVDINTERFACE pVDIfsDisk,
+                                                PVDINTERFACE pVDIfsImage, VDTYPE *penmType));
 
     /**
@@ -99 +101 @@
      * @param   pVDIfsDisk      Pointer to the per-disk VD interface list.
      * @param   pVDIfsImage     Pointer to the per-image VD interface list.
+     * @param   enmType         Requested type of the image.
      * @param   ppBackendData   Opaque state data for this image.
      */
     DECLR3CALLBACKMEMBER(int, pfnOpen, (const char *pszFilename, unsigned uOpenFlags,
                                         PVDINTERFACE pVDIfsDisk, PVDINTERFACE pVDIfsImage,
-                                        void **ppBackendData));
+                                        VDTYPE enmType, void **ppBackendData));
 
     /**

trunk/include/VBox/VBoxHDD.h

@@ -247 +247 @@
 /** @}*/
 
+/** @name VBox HDD container type.
+ * @{
+ */
+typedef enum VDTYPE
+{
+    /** Invalid. */
+    VDTYPE_INVALID = 0,
+    /** HardDisk */
+    VDTYPE_HDD,
+    /** CD/DVD */
+    VDTYPE_DVD,
+    /** Floppy. */
+    VDTYPE_FLOPPY
+} VDTYPE;
+/** @}*/
+
 /**
  * Supported interface types.
@@ -1529 +1545 @@
 
 /**
+ * Structure describing a file extension.
+ */
+typedef struct VDFILEEXTENSION
+{
+    /** Pointer to the NULL-terminated string containing the extension. */
+    const char *pszExtension;
+    /** The device type the extension supports. */
+    VDTYPE      enmType;
+} VDFILEEXTENSION;
+
+/** Pointer to a structure describing a file extension. */
+typedef VDFILEEXTENSION *PVDFILEEXTENSION;
+
+/** Pointer to a const structure describing a file extension. */
+typedef const VDFILEEXTENSION *PCVDFILEEXTENSION;
+
+/**
  * Data structure for returning a list of backend capabilities.
  */
@@ -1540 +1573 @@
      * file extensions. Note that some backends do not work on files, so this
      * pointer may just contain NULL. */
-    const char * const *papszFileExtensions;
+    PCVDFILEEXTENSION paFileExtensions;
     /** Pointer to an array of structs describing each supported config key.
      * Terminated by a NULL config key. Note that some backends do not support
@@ -2000 +2033 @@
  * @return  VBox status code.
  * @param   pVDIfsDisk      Pointer to the per-disk VD interface list.
+ * @param   enmType         Type of the image container.
  * @param   ppDisk          Where to store the reference to HDD container.
  */
-VBOXDDU_DECL(int) VDCreate(PVDINTERFACE pVDIfsDisk, PVBOXHDD *ppDisk);
+VBOXDDU_DECL(int) VDCreate(PVDINTERFACE pVDIfsDisk, VDTYPE enmType, PVBOXHDD *ppDisk);
 
 /**
@@ -2024 +2058 @@
  * @param   ppszFormat      Receives pointer of the UTF-8 string which contains the format name.
  *                          The returned pointer must be freed using RTStrFree().
+ * @param   penmType        Where to store the type of the image.
  */
 VBOXDDU_DECL(int) VDGetFormat(PVDINTERFACE pVDIfsDisk, PVDINTERFACE pVDIfsImage,
-                              const char *pszFilename, char **ppszFormat);
+                              const char *pszFilename, char **ppszFormat, VDTYPE *penmType);
 
 /**

trunk/include/VBox/settings.h

@@ -185 +185 @@
                                const USBDeviceFiltersList &ll,
                                bool fHostMode);
-    void buildHardDisk(xml::ElementNode &elmMedium,
-                       const Medium &m,
-                       uint32_t level);
+    void buildMedium(xml::ElementNode &elmMedium,
+                     DeviceType_T devType,
+                     const Medium &m,
+                     uint32_t level);
     void buildMediaRegistry(xml::ElementNode &elmParent,
                             const MediaRegistry &mr);