Storage

Timestamp:

Oct 28, 2010 3:37:21 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

67173

Message:

VD: Move the generic virtual disk framework + backends to src/VBox/Storage and rename the files to get rid of the HDD part because it supports floppy and DVD images too

Location:

trunk/src/VBox/Storage

Files:

: 2 added
: 8 edited
: 12 moved

. (added)
DMG.cpp (moved) (moved from trunk/src/VBox/Devices/Storage/DMGHDDCore.cpp ) (1 diff)
ISCSI.cpp (moved) (moved from trunk/src/VBox/Devices/Storage/ISCSIHDDCore.cpp ) (1 diff)
Makefile.kmk (added)
Parallels.cpp (moved) (moved from trunk/src/VBox/Devices/Storage/ParallelsHDDCore.cpp ) (1 diff)
RAW.cpp (moved) (moved from trunk/src/VBox/Devices/Storage/RawHDDCore.cpp ) (1 diff)
VCICache.cpp (moved) (moved from trunk/src/VBox/Devices/Storage/VCICacheCore.cpp ) (1 diff)
VD.cpp (moved) (moved from trunk/src/VBox/Devices/Storage/VBoxHDD.cpp ) (4 diffs)
VDFormats (moved) (moved from trunk/src/VBox/Devices/Storage/VBoxHDDFormats )
VDI.cpp (moved) (moved from trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp ) (1 diff)
VDICore.h (moved) (moved from trunk/src/VBox/Devices/Storage/VDICore.h ) (1 diff)
VHD.cpp (moved) (moved from trunk/src/VBox/Devices/Storage/VHDHDDCore.cpp ) (1 diff)
VMDK.cpp (moved) (moved from trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp ) (2 diffs)
testcase (moved) (moved from trunk/src/VBox/Devices/Storage/testcase )
testcase/Makefile.kmk (modified) (2 diffs)
testcase/tstVD-2.cpp (modified) (1 diff)
testcase/tstVD.cpp (modified) (1 diff)
testcase/tstVDCopy.cpp (modified) (1 diff)
testcase/tstVDShareable.cpp (modified) (1 diff)
testcase/tstVDSnap.cpp (modified) (1 diff)
testcase/vbox-img.cpp (modified) (1 diff)
testcase/vditool.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/src/VBox/Storage/DMG.cpp

r33554	r33567
20	20	*******************************************************************************/
21	21	#define LOG_GROUP LOG_GROUP_DEFAULT /** @todo log group */
22		#include <VBox/~~VBoxHDD-P~~lugin.h>
	22	#include <VBox/vd-plugin.h>
23	23	#include <VBox/log.h>
24	24	#include <VBox/err.h>

trunk/src/VBox/Storage/ISCSI.cpp

-              r33554
+              r33567
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_VD_ISCSI
+#include <VBox/VBoxHDD-Plugin.h>
+#define VBOX_VDICORE_VD /* Signal that the header is included from here. */
+#include "VDICore.h"
+#include <VBox/vd-plugin.h>
 #include <VBox/err.h>

trunk/src/VBox/Storage/Parallels.cpp

r33554	r33567
18	18
19	19	#define LOG_GROUP LOG_GROUP_VD_PARALLELS
20		#include <VBox/~~VBoxHDD-P~~lugin.h>
	20	#include <VBox/vd-plugin.h>
21	21	#include <VBox/err.h>
22	22

trunk/src/VBox/Storage/RAW.cpp

r33554	r33567
20	20	*******************************************************************************/
21	21	#define LOG_GROUP LOG_GROUP_VD_RAW
22		#include <VBox/~~VBoxHDD-P~~lugin.h>
	22	#include <VBox/vd-plugin.h>
23	23	#include <VBox/err.h>
24	24

trunk/src/VBox/Storage/VCICache.cpp

r33554	r33567
20	20	*******************************************************************************/
21	21	#define LOG_GROUP LOG_GROUP_VD_RAW /** @todo logging group */
22		#include <VBox/~~VBoxHDD-CacheP~~lugin.h>
	22	#include <VBox/vd-cache-plugin.h>
23	23	#include <VBox/err.h>
24	24

trunk/src/VBox/Storage/VD.cpp

-              r33554
+              r33567
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_VD
 #include <VBox/VBoxHDD.h>
+#include <VBox/vd.h>
 #include <VBox/err.h>
 #include <VBox/sup.h>
 …
 #include <iprt/avl.h>
 #include <VBox/VBoxHDD-Plugin.h>
 #include <VBox/VBoxHDD-CachePlugin.h>
+#include <VBox/vd-plugin.h>
+#include <VBox/vd-cache-plugin.h>
 #define VBOXHDDDISK_SIGNATURE 0x6f0e2a7d
 …
 extern VBOXHDDBACKEND g_ParallelsBackend;
 extern VBOXHDDBACKEND g_DmgBackend;
-#ifdef VBOX_WITH_ISCSI
 extern VBOXHDDBACKEND g_ISCSIBackend;
-#endif
 static unsigned g_cBackends = 0;
 …
     &g_ParallelsBackend,
     &g_DmgBackend,
+    &g_RawBackend
+#ifdef VBOX_WITH_ISCSI
+    ,&g_ISCSIBackend
+#endif
+    &g_RawBackend,
+    &g_ISCSIBackend
 };

trunk/src/VBox/Storage/VDI.cpp

r33554	r33567
19	19	*******************************************************************************/
20	20	#define LOG_GROUP LOG_GROUP_VD_VDI
21		#include <VBox/~~VBoxHDD-P~~lugin.h>
	21	#include <VBox/vd-plugin.h>
22	22	#define VBOX_VDICORE_VD /* Signal that the header is included from here. */
23	23	#include "VDICore.h"

trunk/src/VBox/Storage/VDICore.h

r33554	r33567
22	22	* Header Files *
23	23	*******************************************************************************/
24		#include <VBox/~~VBoxHDD~~.h>
	24	#include <VBox/vd.h>
25	25	#ifndef VBOX_VDICORE_VD
26	26	#include <VBox/pdm.h>

trunk/src/VBox/Storage/VHD.cpp

r33554	r33567
20	20	*******************************************************************************/
21	21	#define LOG_GROUP LOG_GROUP_VD_VHD
22		#include <VBox/~~VBoxHDD-P~~lugin.h>
	22	#include <VBox/vd-plugin.h>
23	23	#include <VBox/err.h>
24	24

trunk/src/VBox/Storage/VMDK.cpp

-              r33554
+              r33567
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_VD_VMDK
 #include <VBox/VBoxHDD-Plugin.h>
+#include <VBox/vd-plugin.h>
 #include <VBox/err.h>
 …
                     continue;
+                }
                 uint64_t uLBA;
+                uint64_t uLBA = 0;
                 uint32_t cbGrainStreamRead = 0;
                 rc = vmdkFileInflateSync(pImage, pExtent,

trunk/src/VBox/Storage/testcase/Makefile.kmk

-              r32782
+              r33567
  tstVDSetUuid_LIBS   = $(LIB_DDU) $(LIB_RUNTIME)
  vbox-img_LIBS = \
+        $(VBOX_LIB_RUNTIME_STATIC)
+        $(VBOX_LIB_RUNTIME_STATIC) \
+        $(PATH_LIB)/StorageLibNoDB$(VBOX_SUFF_LIB)
  if1of ($(KBUILD_TARGET),os2 win)
   vbox-img_LIBS += \
 …
  vbox-img_SOURCES = \
+        vbox-img.cpp \
+        $(VBOX_PATH_DEVICES_SRC)/Storage/VCICacheCore.cpp \
+        $(VBOX_PATH_DEVICES_SRC)/Storage/VBoxHDD.cpp \
+        $(VBOX_PATH_DEVICES_SRC)/Storage/RawHDDCore.cpp \
+        $(VBOX_PATH_DEVICES_SRC)/Storage/VmdkHDDCore.cpp \
+        $(VBOX_PATH_DEVICES_SRC)/Storage/VDIHDDCore.cpp \
+        $(VBOX_PATH_DEVICES_SRC)/Storage/VHDHDDCore.cpp \
+        $(VBOX_PATH_DEVICES_SRC)/Storage/ParallelsHDDCore.cpp \
+        $(VBOX_PATH_DEVICES_SRC)/Storage/DMGHDDCore.cpp
+ vbox-img_DEFS += VBOX_HDD_NO_DYNAMIC_BACKENDS IN_VBOXDDU IN_VBOXDDU_STATIC IN_RT_R3
+        vbox-img.cpp
 endif

trunk/src/VBox/Storage/testcase/tstVD-2.cpp

r33524	r33567
17	17
18	18	#include <VBox/err.h>
19		#include <VBox/~~VBoxHDD~~.h>
	19	#include <VBox/vd.h>
20	20	#include <iprt/string.h>
21	21	#include <iprt/stream.h>

trunk/src/VBox/Storage/testcase/tstVD.cpp

r33524	r33567
19	19	* Header Files *
20	20	*******************************************************************************/
21		#include <VBox/~~VBoxHDD~~.h>
	21	#include <VBox/vd.h>
22	22	#include <VBox/err.h>
23	23	#include <VBox/log.h>

trunk/src/VBox/Storage/testcase/tstVDCopy.cpp

r33540	r33567
18	18
19	19	#include <VBox/err.h>
20		#include <VBox/~~VBoxHDD~~.h>
	20	#include <VBox/vd.h>
21	21	#include <iprt/string.h>
22	22	#include <iprt/stream.h>

trunk/src/VBox/Storage/testcase/tstVDShareable.cpp

r33524	r33567
19	19	* Header Files *
20	20	*******************************************************************************/
21		#include <VBox/~~VBoxHDD~~.h>
	21	#include <VBox/vd.h>
22	22	#include <VBox/err.h>
23	23	#include <VBox/log.h>

trunk/src/VBox/Storage/testcase/tstVDSnap.cpp

r33524	r33567
16	16	*/
17	17
18		#include <VBox/~~VBoxHDD~~.h>
	18	#include <VBox/vd.h>
19	19	#include <VBox/err.h>
20	20	#include <VBox/log.h>

trunk/src/VBox/Storage/testcase/vbox-img.cpp

r33524	r33567
19	19	* Header Files *
20	20	*******************************************************************************/
21		#include <VBox/~~VBoxHDD~~.h>
	21	#include <VBox/vd.h>
22	22	#include <VBox/err.h>
23	23	#include <VBox/version.h>

trunk/src/VBox/Storage/testcase/vditool.cpp

r33524	r33567
19	19	* Header Files *
20	20	*******************************************************************************/
21		#include <VBox/~~VBoxHDD~~.h>
	21	#include <VBox/vd.h>
22	22	#include <iprt/alloc.h>
23	23	#include <iprt/file.h>

Note: See TracChangeset for help on using the changeset viewer.

Changeset 33567 in vbox for trunk/src/VBox/Storage

Legend:

Download in other formats: