VirtualBox

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


Ignore:
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

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Storage/DMG.cpp

    r33554 r33567  
    2020*******************************************************************************/
    2121#define LOG_GROUP LOG_GROUP_DEFAULT /** @todo log group */
    22 #include <VBox/VBoxHDD-Plugin.h>
     22#include <VBox/vd-plugin.h>
    2323#include <VBox/log.h>
    2424#include <VBox/err.h>
  • trunk/src/VBox/Storage/ISCSI.cpp

    r33554 r33567  
    2121*******************************************************************************/
    2222#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>
    2624#include <VBox/err.h>
    2725
  • trunk/src/VBox/Storage/Parallels.cpp

    r33554 r33567  
    1818
    1919#define LOG_GROUP LOG_GROUP_VD_PARALLELS
    20 #include <VBox/VBoxHDD-Plugin.h>
     20#include <VBox/vd-plugin.h>
    2121#include <VBox/err.h>
    2222
  • trunk/src/VBox/Storage/RAW.cpp

    r33554 r33567  
    2020*******************************************************************************/
    2121#define LOG_GROUP LOG_GROUP_VD_RAW
    22 #include <VBox/VBoxHDD-Plugin.h>
     22#include <VBox/vd-plugin.h>
    2323#include <VBox/err.h>
    2424
  • trunk/src/VBox/Storage/VCICache.cpp

    r33554 r33567  
    2020*******************************************************************************/
    2121#define LOG_GROUP LOG_GROUP_VD_RAW /** @todo logging group */
    22 #include <VBox/VBoxHDD-CachePlugin.h>
     22#include <VBox/vd-cache-plugin.h>
    2323#include <VBox/err.h>
    2424
  • trunk/src/VBox/Storage/VD.cpp

    r33554 r33567  
    2020*******************************************************************************/
    2121#define LOG_GROUP LOG_GROUP_VD
    22 #include <VBox/VBoxHDD.h>
     22#include <VBox/vd.h>
    2323#include <VBox/err.h>
    2424#include <VBox/sup.h>
     
    4141#include <iprt/avl.h>
    4242
    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>
    4545
    4646#define VBOXHDDDISK_SIGNATURE 0x6f0e2a7d
     
    444444extern VBOXHDDBACKEND g_ParallelsBackend;
    445445extern VBOXHDDBACKEND g_DmgBackend;
    446 #ifdef VBOX_WITH_ISCSI
    447446extern VBOXHDDBACKEND g_ISCSIBackend;
    448 #endif
    449447
    450448static unsigned g_cBackends = 0;
     
    457455    &g_ParallelsBackend,
    458456    &g_DmgBackend,
    459     &g_RawBackend
    460 #ifdef VBOX_WITH_ISCSI
    461     ,&g_ISCSIBackend
    462 #endif
     457    &g_RawBackend,
     458    &g_ISCSIBackend
    463459};
    464460
  • trunk/src/VBox/Storage/VDI.cpp

    r33554 r33567  
    1919*******************************************************************************/
    2020#define LOG_GROUP LOG_GROUP_VD_VDI
    21 #include <VBox/VBoxHDD-Plugin.h>
     21#include <VBox/vd-plugin.h>
    2222#define VBOX_VDICORE_VD /* Signal that the header is included from here. */
    2323#include "VDICore.h"
  • trunk/src/VBox/Storage/VDICore.h

    r33554 r33567  
    2222*   Header Files                                                               *
    2323*******************************************************************************/
    24 #include <VBox/VBoxHDD.h>
     24#include <VBox/vd.h>
    2525#ifndef VBOX_VDICORE_VD
    2626#include <VBox/pdm.h>
  • trunk/src/VBox/Storage/VHD.cpp

    r33554 r33567  
    2020*******************************************************************************/
    2121#define LOG_GROUP LOG_GROUP_VD_VHD
    22 #include <VBox/VBoxHDD-Plugin.h>
     22#include <VBox/vd-plugin.h>
    2323#include <VBox/err.h>
    2424
  • trunk/src/VBox/Storage/VMDK.cpp

    r33554 r33567  
    2020*******************************************************************************/
    2121#define LOG_GROUP LOG_GROUP_VD_VMDK
    22 #include <VBox/VBoxHDD-Plugin.h>
     22#include <VBox/vd-plugin.h>
    2323#include <VBox/err.h>
    2424
     
    56215621                    continue;
    56225622                }
    5623                 uint64_t uLBA;
     5623                uint64_t uLBA = 0;
    56245624                uint32_t cbGrainStreamRead = 0;
    56255625                rc = vmdkFileInflateSync(pImage, pExtent,
  • trunk/src/VBox/Storage/testcase/Makefile.kmk

    r32782 r33567  
    6363 tstVDSetUuid_LIBS   = $(LIB_DDU) $(LIB_RUNTIME)
    6464 vbox-img_LIBS = \
    65         $(VBOX_LIB_RUNTIME_STATIC)
     65        $(VBOX_LIB_RUNTIME_STATIC) \
     66        $(PATH_LIB)/StorageLibNoDB$(VBOX_SUFF_LIB)
    6667 if1of ($(KBUILD_TARGET),os2 win)
    6768  vbox-img_LIBS += \
     
    8788
    8889 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
    9991endif
    10092
  • trunk/src/VBox/Storage/testcase/tstVD-2.cpp

    r33524 r33567  
    1717
    1818#include <VBox/err.h>
    19 #include <VBox/VBoxHDD.h>
     19#include <VBox/vd.h>
    2020#include <iprt/string.h>
    2121#include <iprt/stream.h>
  • trunk/src/VBox/Storage/testcase/tstVD.cpp

    r33524 r33567  
    1919*   Header Files                                                               *
    2020*******************************************************************************/
    21 #include <VBox/VBoxHDD.h>
     21#include <VBox/vd.h>
    2222#include <VBox/err.h>
    2323#include <VBox/log.h>
  • trunk/src/VBox/Storage/testcase/tstVDCopy.cpp

    r33540 r33567  
    1818
    1919#include <VBox/err.h>
    20 #include <VBox/VBoxHDD.h>
     20#include <VBox/vd.h>
    2121#include <iprt/string.h>
    2222#include <iprt/stream.h>
  • trunk/src/VBox/Storage/testcase/tstVDShareable.cpp

    r33524 r33567  
    1919*   Header Files                                                               *
    2020*******************************************************************************/
    21 #include <VBox/VBoxHDD.h>
     21#include <VBox/vd.h>
    2222#include <VBox/err.h>
    2323#include <VBox/log.h>
  • trunk/src/VBox/Storage/testcase/tstVDSnap.cpp

    r33524 r33567  
    1616 */
    1717
    18 #include <VBox/VBoxHDD.h>
     18#include <VBox/vd.h>
    1919#include <VBox/err.h>
    2020#include <VBox/log.h>
  • trunk/src/VBox/Storage/testcase/vbox-img.cpp

    r33524 r33567  
    1919*   Header Files                                                               *
    2020*******************************************************************************/
    21 #include <VBox/VBoxHDD.h>
     21#include <VBox/vd.h>
    2222#include <VBox/err.h>
    2323#include <VBox/version.h>
  • trunk/src/VBox/Storage/testcase/vditool.cpp

    r33524 r33567  
    1919*   Header Files                                                               *
    2020*******************************************************************************/
    21 #include <VBox/VBoxHDD.h>
     21#include <VBox/vd.h>
    2222#include <iprt/alloc.h>
    2323#include <iprt/file.h>
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette