Changeset 4522 in vbox for trunk

Timestamp:

Sep 5, 2007 7:43:09 AM (17 years ago)

Author:

vboxsync

Message:

Add StorageCraft Backup images as HDD format

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• Storage/VBoxHDD-new.cpp (modified) (4 diffs)
• Storage/VBoxHDD-newInternal.h (modified) (3 diffs)
• Storage/VmdkHDDCore.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -32 +32 @@
 SUBDIRS_CLEAN     = PC/Etherboot-src
 endif
+
+SUBDIRS_LIBRARIES += Storage/VBoxHDDFormats
 
 #

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

@@ -30 +30 @@
 #include <iprt/string.h>
 #include <iprt/asm.h>
+#include <iprt/ldr.h>
 
 #include "VBoxHDD-newInternal.h"
@@ -100 +101 @@
     void                *pvErrorUser;
 
+    /** Handle for the shared object / DLL. */
+    RTLDRMOD            pluginHandle;
     /** Function pointers for the various backend methods. */
     PVBOXHDDBACKEND     Backend;
@@ -487 +490 @@
         }
     }
+
+    /* If no static backend is found try loading a shared module with pszBackend as filename. */
+    if (!pBackend)
+    {
+        RTLDRMOD ldrHandle;
+        char *pszPluginName;
+        size_t cbPluginName;
+
+        /* HDD Format Plugins have VBoxHDD as prefix, thatswhy we have to prepend it. 
+         * @todo: find out what to do if filenames are case sensitive.
+         */
+        cbPluginName = RTStrAPrintf(&pszPluginName, "VBoxHDD%s", pszBackend);
+        if (cbPluginName == -1)
+        {
+            rc = VERR_NO_MEMORY;
+        }
+        else
+        {
+            /* try to load the plugin (RTldrLoad appends the suffix for the shared object/DLL). */
+            rc = RTLdrLoad(pszPluginName, &ldrHandle);
+            if (VBOX_SUCCESS(rc))
+            {
+                PFNVBOXHDDFORMATLOAD pfnHDDFormatLoad;
+
+                rc = RTLdrGetSymbol (ldrHandle, VBOX_HDDFORMAT_LOAD_NAME, (void**)&pfnHDDFormatLoad);
+                if (VBOX_FAILURE(rc) || !pfnHDDFormatLoad)
+                {
+                    Log(("%s: Error resolving the entry point %s, rc = %d, pfnHDDFormat = %p\n", VBOX_HDDFORMAT_LOAD_NAME, rc, pfnHDDFormatLoad));
+                    if (VBOX_SUCCESS(rc))
+                       rc = VERR_SYMBOL_NOT_FOUND;
+                }
+                else
+                {
+                    /* Get the function table. */
+                    pBackend = (PVBOXHDDBACKEND)RTMemAllocZ(sizeof(VBOXHDDBACKEND));
+                    if (!pBackend)
+                    {
+                        rc = VERR_NO_MEMORY;
+                    }
+                    else
+                    {
+                        pBackend->cbSize = sizeof(VBOXHDDBACKEND);
+                        rc = pfnHDDFormatLoad(pBackend);
+                        if (VBOX_FAILURE(rc))
+                        {
+                            RTMemFree(pBackend);
+                            pBackend = NULL;
+                        }
+                    }
+                }
+            }
+            RTStrFree(pszPluginName);
+        }
+    }
+
     if (pBackend)
     {
@@ -533 +591 @@
     {
         VDCloseAll(pDisk);
+        RTLdrClose(pDisk->pluginHandle);
+        RTMemFree(pDisk->Backend);
         RTMemFree(pDisk);
     }

trunk/src/VBox/Devices/Storage/VBoxHDD-newInternal.h

@@ -21 +21 @@
 #include <VBox/VBoxHDD-new.h>
 
-
 /**
  * Image format backend interface used by VBox HDD Container implementation.
@@ -27 +26 @@
 typedef struct VBOXHDDBACKEND
 {
+    /**
+     * The size of the structure.
+     */
+    uint32_t cbSize;
+
     /**
      * Open a disk image.
@@ -277 +281 @@
 } VBOXHDDBACKEND, *PVBOXHDDBACKEND;
 
+/** Initialization entry point. */
+typedef DECLCALLBACK(int) VBOXHDDFORMATLOAD(PVBOXHDDBACKEND pBackendTable);
+typedef VBOXHDDFORMATLOAD *PFNVBOXHDDFORMATLOAD;
+#define VBOX_HDDFORMAT_LOAD_NAME "VBoxHDDFormatLoad"
 
 #endif

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

@@ -3480 +3480 @@
 VBOXHDDBACKEND g_VmdkBackend =
 {
+    /* cbSize */
+    sizeof(VBOXHDDBACKEND),
     /* pfnOpen */
     vmdkOpen,