Changeset 33567 in vbox for trunk/src/VBox/Storage
- Timestamp:
- Oct 28, 2010 3:37:21 PM (14 years ago)
- svn:sync-xref-src-repo-rev:
- 67173
- Location:
- trunk/src/VBox/Storage
- Files:
-
- 2 added
- 8 edited
- 12 moved
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-Plugin.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 21 21 *******************************************************************************/ 22 22 #define LOG_GROUP LOG_GROUP_VD_ISCSI 23 #include <VBox/VBoxHDD-Plugin.h> 24 #define VBOX_VDICORE_VD /* Signal that the header is included from here. */ 25 #include "VDICore.h" 23 #include <VBox/vd-plugin.h> 26 24 #include <VBox/err.h> 27 25 -
trunk/src/VBox/Storage/Parallels.cpp
r33554 r33567 18 18 19 19 #define LOG_GROUP LOG_GROUP_VD_PARALLELS 20 #include <VBox/ VBoxHDD-Plugin.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-Plugin.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-CachePlugin.h>22 #include <VBox/vd-cache-plugin.h> 23 23 #include <VBox/err.h> 24 24 -
trunk/src/VBox/Storage/VD.cpp
r33554 r33567 20 20 *******************************************************************************/ 21 21 #define LOG_GROUP LOG_GROUP_VD 22 #include <VBox/ VBoxHDD.h>22 #include <VBox/vd.h> 23 23 #include <VBox/err.h> 24 24 #include <VBox/sup.h> … … 41 41 #include <iprt/avl.h> 42 42 43 #include <VBox/ VBoxHDD-Plugin.h>44 #include <VBox/ VBoxHDD-CachePlugin.h>43 #include <VBox/vd-plugin.h> 44 #include <VBox/vd-cache-plugin.h> 45 45 46 46 #define VBOXHDDDISK_SIGNATURE 0x6f0e2a7d … … 444 444 extern VBOXHDDBACKEND g_ParallelsBackend; 445 445 extern VBOXHDDBACKEND g_DmgBackend; 446 #ifdef VBOX_WITH_ISCSI447 446 extern VBOXHDDBACKEND g_ISCSIBackend; 448 #endif449 447 450 448 static unsigned g_cBackends = 0; … … 457 455 &g_ParallelsBackend, 458 456 &g_DmgBackend, 459 &g_RawBackend 460 #ifdef VBOX_WITH_ISCSI 461 ,&g_ISCSIBackend 462 #endif 457 &g_RawBackend, 458 &g_ISCSIBackend 463 459 }; 464 460 -
trunk/src/VBox/Storage/VDI.cpp
r33554 r33567 19 19 *******************************************************************************/ 20 20 #define LOG_GROUP LOG_GROUP_VD_VDI 21 #include <VBox/ VBoxHDD-Plugin.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-Plugin.h>22 #include <VBox/vd-plugin.h> 23 23 #include <VBox/err.h> 24 24 -
trunk/src/VBox/Storage/VMDK.cpp
r33554 r33567 20 20 *******************************************************************************/ 21 21 #define LOG_GROUP LOG_GROUP_VD_VMDK 22 #include <VBox/ VBoxHDD-Plugin.h>22 #include <VBox/vd-plugin.h> 23 23 #include <VBox/err.h> 24 24 … … 5621 5621 continue; 5622 5622 } 5623 uint64_t uLBA ;5623 uint64_t uLBA = 0; 5624 5624 uint32_t cbGrainStreamRead = 0; 5625 5625 rc = vmdkFileInflateSync(pImage, pExtent, -
trunk/src/VBox/Storage/testcase/Makefile.kmk
r32782 r33567 63 63 tstVDSetUuid_LIBS = $(LIB_DDU) $(LIB_RUNTIME) 64 64 vbox-img_LIBS = \ 65 $(VBOX_LIB_RUNTIME_STATIC) 65 $(VBOX_LIB_RUNTIME_STATIC) \ 66 $(PATH_LIB)/StorageLibNoDB$(VBOX_SUFF_LIB) 66 67 if1of ($(KBUILD_TARGET),os2 win) 67 68 vbox-img_LIBS += \ … … 87 88 88 89 vbox-img_SOURCES = \ 89 vbox-img.cpp \ 90 $(VBOX_PATH_DEVICES_SRC)/Storage/VCICacheCore.cpp \ 91 $(VBOX_PATH_DEVICES_SRC)/Storage/VBoxHDD.cpp \ 92 $(VBOX_PATH_DEVICES_SRC)/Storage/RawHDDCore.cpp \ 93 $(VBOX_PATH_DEVICES_SRC)/Storage/VmdkHDDCore.cpp \ 94 $(VBOX_PATH_DEVICES_SRC)/Storage/VDIHDDCore.cpp \ 95 $(VBOX_PATH_DEVICES_SRC)/Storage/VHDHDDCore.cpp \ 96 $(VBOX_PATH_DEVICES_SRC)/Storage/ParallelsHDDCore.cpp \ 97 $(VBOX_PATH_DEVICES_SRC)/Storage/DMGHDDCore.cpp 98 vbox-img_DEFS += VBOX_HDD_NO_DYNAMIC_BACKENDS IN_VBOXDDU IN_VBOXDDU_STATIC IN_RT_R3 90 vbox-img.cpp 99 91 endif 100 92 -
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.