Changeset 2390 in vbox for trunk

Timestamp:

Apr 27, 2007 11:03:46 AM (18 years ago)

Author:

vboxsync

Message:

Resurrect old VMDK code and make it default.

Location:

trunk/src/VBox

Files:

• Devices/Builtins.cpp (modified) (1 diff)
• Devices/Builtins.h (modified) (1 diff)
• Devices/Makefile (modified) (1 diff)
• Devices/Storage/DrvVmdk.cpp (copied) (copied from trunk/src/VBox/Devices/Storage/VmdkHDD.cpp )
• Main/ConsoleImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Builtins.cpp

@@ -153 +153 @@
     if (VBOX_FAILURE(rc))
         return rc;
+#ifndef __L4ENV__
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvVmdkHDD);
+    if (VBOX_FAILURE(rc))
+        return rc;
+#endif
 #if defined(__DARWIN__) || defined(__LINUX__) || defined(__WIN__)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostDVD);

trunk/src/VBox/Devices/Builtins.h

@@ -61 +61 @@
 extern const PDMDRVREG g_DrvVBoxHDD;
 extern const PDMDRVREG g_DrvVD;
+extern const PDMDRVREG g_DrvVmdkHDD;
 extern const PDMDRVREG g_DrvHostDVD;
 extern const PDMDRVREG g_DrvHostFloppy;

trunk/src/VBox/Devices/Makefile

@@ -382 +382 @@
         Storage/DrvRawImage.cpp \
         Storage/DrvVD.cpp \
+        Storage/DrvVmdk.cpp \
         Storage/VBoxHDD.cpp
 

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -4992 +4992 @@
 
             rc = CFGMR3InsertNode(pLunL0,   "AttachedDriver", &pLunL1);                 RC_CHECK();
+#if 0 /* Disabled new virtual hdd containder code for now, causes trouble with vmdks. */
             rc = CFGMR3InsertString(pLunL1, "Driver",         "VD");               RC_CHECK();
+#else
+            rc = CFGMR3InsertString(pLunL1, "Driver",         "VmdkHDD");               RC_CHECK();
+#endif
             rc = CFGMR3InsertNode(pLunL1,   "Config", &pCfg);                           RC_CHECK();
             hrc = vmdkDisk->COMGETTER(FilePath)(&str);                                  H();
@@ -5781 +5785 @@
                         {
                             Log(("attachToHostInterface: %RTfile %ls\n", maTapFD[slot], tapDeviceName.raw()));
-    
+
                             /*
                             * Here is the right place to communicate the TAP file descriptor and