VirtualBox

Changeset 15366 in vbox for trunk/include


Ignore:
Timestamp:
Dec 12, 2008 1:50:32 PM (16 years ago)
Author:
vboxsync
Message:

Storage: Eradicated the last bits using the old VDI only backend, keeping only the testcases for now (no longer built).

Completely removed old iSCSI driver.

Added intnet option to addiscsidisk and adjusted documentation.

Made backend name comparisons case-insensitive.

Detect VMDK files not according to VMDK 1.0 and reject with clear error message.

Changed format probing logic to not fall through to the "unsupported" case if it's a known format, i.e. has valid header.

VBoxManage converthd generic format converter made official.

Added format flag to VBoxManage createhd, allows creating VMDK files.

VBoxManage convertdd reimplemented based on new framework, supporting any image format.

VBoxManage internalcommands sethduuid reimplemented based on new framework, supporting any image format.

Cleaned up error codes.

Location:
trunk/include/VBox
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/VBoxHDD-new.h

    r14967 r15366  
    10491049typedef struct VDBACKENDINFO
    10501050{
    1051     /** Name of the backend. */
     1051    /** Name of the backend. Must be unique even with case insensitive comparison. */
    10521052    const char *pszBackend;
    10531053    /** Capabilities of the backend (a combination of the VD_CAP_* flags). */
    … …  
    11161116 *
    11171117 * @return  VBox status code.
    1118  * @param   pszBackend      The backend name.
     1118 * @param   pszBackend      The backend name (case insensitive).
    11191119 * @param   pEntries        Pointer to an entry.
    11201120 */
    … …  
    11641164 * @return  VBox status code.
    11651165 * @param   pDisk           Pointer to HDD container.
    1166  * @param   pszBackend      Name of the image file backend to use.
     1166 * @param   pszBackend      Name of the image file backend to use (case insensitive).
    11671167 * @param   pszFilename     Name of the image file to open.
    11681168 * @param   uOpenFlags      Image file open mode, see VD_OPEN_FLAGS_* constants.
    … …  
    11781178 * @return  VBox status code.
    11791179 * @param   pDisk           Pointer to HDD container.
    1180  * @param   pszBackend      Name of the image file backend to use.
     1180 * @param   pszBackend      Name of the image file backend to use (case insensitive).
    11811181 * @param   pszFilename     Name of the image file to create.
    11821182 * @param   enmType         Image type, only base image types are acceptable.
    … …  
    12071207 * @return  VBox status code.
    12081208 * @param   pDisk           Pointer to HDD container.
    1209  * @param   pszBackend      Name of the image file backend to use.
     1209 * @param   pszBackend      Name of the image file backend to use (case insensitive).
    12101210 * @param   pszFilename     Name of the differencing image file to create.
    12111211 * @param   uImageFlags     Flags specifying special image features.
    … …  
    12291229 *
    12301230 * @return  VBox status code.
    1231  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1231 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    12321232 * @param   pDisk           Pointer to HDD container.
    12331233 * @param   nImageFrom      Name of the image file to merge from.
    … …  
    12491249 *
    12501250 * @return  VBox status code.
    1251  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1251 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    12521252 * @param   pDiskFrom       Pointer to source HDD container.
    12531253 * @param   nImage          Image number, counts from 0. 0 is always base image of container.
    12541254 * @param   pDiskTo         Pointer to destination HDD container.
    1255  * @param   pszBackend      Name of the image file backend to use (may be NULL to use the same as the source).
     1255 * @param   pszBackend      Name of the image file backend to use (may be NULL to use the same as the source, case insensitive).
    12561256 * @param   pszFilename     New name of the image (may be NULL if pDiskFrom == pDiskTo).
    12571257 * @param   fMoveByRename   If true, attempt to perform a move by renaming (if successful the new size is ignored).
    … …  
    12771277 *
    12781278 * @return  VBox status code.
    1279  * @return  VERR_VDI_NOT_OPENED if no image is opened in HDD container.
     1279 * @return  VERR_VD_NOT_OPENED if no image is opened in HDD container.
    12801280 * @param   pDisk           Pointer to HDD container.
    12811281 * @param   fDelete         If true, delete the image from the host disk.
    … …  
    12951295 *
    12961296 * @return  VBox status code.
    1297  * @return  VERR_VDI_NOT_OPENED if no image is opened in HDD container.
     1297 * @return  VERR_VD_NOT_OPENED if no image is opened in HDD container.
    12981298 * @param   pDisk           Pointer to HDD container.
    12991299 * @param   uOffset         Offset of first reading byte from start of disk.
    … …  
    13091309 *
    13101310 * @return  VBox status code.
    1311  * @return  VERR_VDI_NOT_OPENED if no image is opened in HDD container.
     1311 * @return  VERR_VD_NOT_OPENED if no image is opened in HDD container.
    13121312 * @param   pDisk           Pointer to HDD container.
    13131313 * @param   uOffset         Offset of first writing byte from start of disk.
    … …  
    13231323 *
    13241324 * @return  VBox status code.
    1325  * @return  VERR_VDI_NOT_OPENED if no image is opened in HDD container.
     1325 * @return  VERR_VD_NOT_OPENED if no image is opened in HDD container.
    13261326 * @param   pDisk           Pointer to HDD container.
    13271327 */
    … …  
    13691369 *
    13701370 * @return  VBox status code.
    1371  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
    1372  * @return  VERR_VDI_GEOMETRY_NOT_SET if no geometry present in the HDD container.
     1371 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
     1372 * @return  VERR_VD_GEOMETRY_NOT_SET if no geometry present in the HDD container.
    13731373 * @param   pDisk           Pointer to HDD container.
    13741374 * @param   nImage          Image number, counts from 0. 0 is always base image of container.
    … …  
    13821382 *
    13831383 * @return  VBox status code.
    1384  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1384 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    13851385 * @param   pDisk           Pointer to HDD container.
    13861386 * @param   nImage          Image number, counts from 0. 0 is always base image of container.
    … …  
    13941394 *
    13951395 * @return  VBox status code.
    1396  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
    1397  * @return  VERR_VDI_GEOMETRY_NOT_SET if no geometry present in the HDD container.
     1396 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
     1397 * @return  VERR_VD_GEOMETRY_NOT_SET if no geometry present in the HDD container.
    13981398 * @param   pDisk           Pointer to HDD container.
    13991399 * @param   nImage          Image number, counts from 0. 0 is always base image of container.
    … …  
    14071407 *
    14081408 * @return  VBox status code.
    1409  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1409 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    14101410 * @param   pDisk           Pointer to HDD container.
    14111411 * @param   nImage          Image number, counts from 0. 0 is always base image of container.
    … …  
    14191419 *
    14201420 * @return  VBox status code.
    1421  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1421 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    14221422 * @param   pDisk           Pointer to HDD container.
    14231423 * @param   nImage          Image number, counts from 0. 0 is always base image of container.
    … …  
    14311431 *
    14321432 * @return  VBox status code.
    1433  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1433 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    14341434 * @param   pDisk           Pointer to HDD container.
    14351435 * @param   nImage          Image number, counts from 0. 0 is always base image of container.
    … …  
    14431443 *
    14441444 * @return  VBox status code.
    1445  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1445 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    14461446 * @param   pDisk           Pointer to the HDD container.
    14471447 * @param   nImage          Image number, counts from 0. 0 is always base image of container.
    … …  
    14551455 *
    14561456 * @return  VBox status code.
    1457  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1457 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    14581458 * @param   pDisk           Pointer to HDD container.
    14591459 * @param   nImage          Image number, counts from 0. 0 is always base image of container.
    … …  
    14661466 *
    14671467 * @return  VBox status code.
    1468  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1468 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    14691469 * @param   pDisk           Pointer to HDD container.
    14701470 * @param   nImage          Image number, counts from 0. 0 is always base image of container.
    … …  
    14801480 *
    14811481 * @return  VBox status code.
    1482  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1482 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    14831483 * @param   pDisk           Pointer to HDD container.
    14841484 * @param   nImage          Image number, counts from 0. 0 is always base image of container.
    … …  
    14941494 *
    14951495 * @return  VBox status code.
    1496  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1496 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    14971497 * @return  VERR_BUFFER_OVERFLOW if pszFilename buffer too small to hold filename.
    14981498 * @param   pDisk           Pointer to HDD container.
    … …  
    15081508 *
    15091509 * @return  VBox status code.
    1510  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1510 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    15111511 * @return  VERR_BUFFER_OVERFLOW if pszComment buffer too small to hold comment text.
    15121512 * @param   pDisk           Pointer to HDD container.
    … …  
    15221522 *
    15231523 * @return  VBox status code.
    1524  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1524 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    15251525 * @param   pDisk           Pointer to HDD container.
    15261526 * @param   nImage          Image number, counts from 0. 0 is always base image of container.
    … …  
    15341534 *
    15351535 * @return  VBox status code.
    1536  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1536 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    15371537 * @param   pDisk           Pointer to HDD container.
    15381538 * @param   nImage          Image number, counts from 0. 0 is always base image of container.
    … …  
    15451545 *
    15461546 * @return  VBox status code.
    1547  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1547 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    15481548 * @param   pDisk           Pointer to HDD container.
    15491549 * @param   nImage          Image number, counts from 0. 0 is always base image of container.
    … …  
    15561556 *
    15571557 * @return  VBox status code.
    1558  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1558 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    15591559 * @param   pDisk           Pointer to HDD container.
    15601560 * @param   nImage          Image number, counts from 0. 0 is always base image of container.
    … …  
    15681568 *
    15691569 * @return  VBox status code.
    1570  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1570 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    15711571 * @param   pDisk           Pointer to HDD container.
    15721572 * @param   nImage          Image number, counts from 0. 0 is always base image of container.
    … …  
    15801580 *
    15811581 * @return  VBox status code.
    1582  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1582 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    15831583 * @param   pDisk           Pointer to HDD container.
    15841584 * @param   nImage          Image number, counts from 0. 0 is always base image of the container.
    … …  
    16121612 *
    16131613 * @return  VBox status code.
    1614  * @return  VERR_VDI_IMAGE_NOT_FOUND if image with specified number was not opened.
     1614 * @return  VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
    16151615 * @param   pDisk           Pointer to the HDD container.
    16161616 * @param   nImage          Image number, counts from 0. 0 is always base image of container.

  • trunk/include/VBox/err.h

    r15284 r15366  
    10301030
    10311031
    1032 /** @name VBox HDD Container (VDI) Status Codes
    1033  * @{
    1034  */
    1035 /** Invalid image file header. */
    1036 #define VERR_VDI_INVALID_HEADER                     (-3200)
    1037 /** Invalid image file header: invalid signature. */
    1038 #define VERR_VDI_INVALID_SIGNATURE                  (-3201)
    1039 /** Invalid image file header: invalid version. */
    1040 #define VERR_VDI_UNSUPPORTED_VERSION                (-3202)
     1032/** @name VBox HDD Container (VD) Status Codes
     1033 * @{
     1034 */
    10411035/** Invalid image type. */
    1042 #define VERR_VDI_INVALID_TYPE                       (-3203)
    1043 /** Invalid image flags. */
    1044 #define VERR_VDI_INVALID_FLAGS                      (-3204)
     1036#define VERR_VD_INVALID_TYPE                        (-3200)
    10451037/** Operation can't be done in current HDD container state. */
    1046 #define VERR_VDI_INVALID_STATE                      (-3205)
    1047 /** Differencing image can't be used with current base image. */
    1048 #define VERR_VDI_WRONG_DIFF_IMAGE                   (-3206)
    1049 /** Two or more images of one HDD has different versions. */
    1050 #define VERR_VDI_IMAGES_VERSION_MISMATCH            (-3207)
     1038#define VERR_VD_INVALID_STATE                       (-3201)
     1039/** Configuration value not found. */
     1040#define VERR_VD_VALUE_NOT_FOUND                     (-3202)
     1041/** Virtual HDD is not opened. */
     1042#define VERR_VD_NOT_OPENED                          (-3203)
     1043/** Requested image is not opened. */
     1044#define VERR_VD_IMAGE_NOT_FOUND                     (-3204)
     1045/** Image is read-only. */
     1046#define VERR_VD_IMAGE_READ_ONLY                     (-3205)
     1047/** Geometry hasn't been set. */
     1048#define VERR_VD_GEOMETRY_NOT_SET                    (-3206)
     1049/** No data for this block in image. */
     1050#define VERR_VD_BLOCK_FREE                          (-3207)
    10511051/** Differencing and parent images can't be used together due to UUID. */
    1052 #define VERR_VDI_IMAGES_UUID_MISMATCH               (-3208)
    1053 /** No differencing images to commit. */
    1054 #define VERR_VDI_NO_DIFF_IMAGES                     (-3209)
    1055 /** Virtual HDD is not opened. */
    1056 #define VERR_VDI_NOT_OPENED                         (-3210)
    1057 /** Requested image is not opened. */
    1058 #define VERR_VDI_IMAGE_NOT_FOUND                    (-3211)
    1059 /** Image is read-only. */
    1060 #define VERR_VDI_IMAGE_READ_ONLY                    (-3212)
     1052#define VERR_VD_UUID_MISMATCH                       (-3208)
     1053/** Asynchronous I/O request finished. */
     1054#define VINF_VD_ASYNC_IO_FINISHED                   3209
     1055/** Asynchronous I/O is not finished yet. */
     1056#define VERR_VD_ASYNC_IO_IN_PROGRESS                (-3210)
     1057/** Generic: Invalid image file header. Use this for plugins. */
     1058#define VERR_VD_GEN_INVALID_HEADER                  (-3220)
     1059/** VDI: Invalid image file header. */
     1060#define VERR_VD_VDI_INVALID_HEADER                  (-3230)
     1061/** VDI: Invalid image file header: invalid signature. */
     1062#define VERR_VD_VDI_INVALID_SIGNATURE               (-3231)
     1063/** VDI: Invalid image file header: invalid version. */
     1064#define VERR_VD_VDI_UNSUPPORTED_VERSION             (-3232)
    10611065/** Comment string is too long. */
    1062 #define VERR_VDI_COMMENT_TOO_LONG                   (-3213)
    1063 /** Geometry hasn't been set. */
    1064 #define VERR_VDI_GEOMETRY_NOT_SET                   (-3214)
    1065 /** No data for this block in image. */
    1066 #define VERR_VDI_BLOCK_FREE                         (-3215)
    1067 /** Configuration value not found. */
    1068 #define VERR_VDI_VALUE_NOT_FOUND                    (-3216)
    1069 /** Configuration value is unknown. This indicates misconfiguration. */
    1070 #define VERR_VDI_UNKNOWN_CFG_VALUES                 (-3217)
    1071 /** Asynchronous I/O request finished. */
    1072 #define VINF_VDI_ASYNC_IO_FINISHED                  3218
    1073 /** Asynchronous I/O is not finished yet. */
    1074 #define VERR_VDI_ASYNC_IO_IN_PROGRESS               (-3219)
     1066#define VERR_VD_VDI_COMMENT_TOO_LONG                (-3233)
     1067/** VMDK: Invalid image file header. */
     1068#define VERR_VD_VMDK_INVALID_HEADER                 (-3240)
     1069/** VMDK: Invalid image file header: invalid version. */
     1070#define VERR_VD_VMDK_UNSUPPORTED_VERSION            (-3241)
     1071/** VMDK: Image property not found. */
     1072#define VERR_VD_VMDK_VALUE_NOT_FOUND                (-3242)
     1073/** VMDK: Operation can't be done in current image state. */
     1074#define VERR_VD_VMDK_INVALID_STATE                  (-3243)
     1075/** iSCSI: Invalid header, i.e. dummy for validity check. */
     1076#define VERR_VD_ISCSI_INVALID_HEADER                (-3250)
     1077/** iSCSI: Configuration value is unknown. This indicates misconfiguration. */
     1078#define VERR_VD_ISCSI_UNKNOWN_CFG_VALUES            (-3251)
     1079/** iSCSI: Interface is unknown. This indicates misconfiguration. */
     1080#define VERR_VD_ISCSI_UNKNOWN_INTERFACE             (-3252)
     1081/** iSCSI: Operation can't be done in current image state. */
     1082#define VERR_VD_ISCSI_INVALID_STATE                 (-3253)
     1083/** iSCSI: Invalid device type (not a disk). */
     1084#define VERR_VD_ISCSI_INVALID_TYPE                  (-3254)
     1085/** VHD: Invalid image file header. */
     1086#define VERR_VD_VHD_INVALID_HEADER                  (-3260)
     1087/** Raw: Invalid image file header. */
     1088#define VERR_VD_RAW_INVALID_HEADER                  (-3270)
     1089/** Raw: Invalid image file type. */
     1090#define VERR_VD_RAW_INVALID_TYPE                    (-3271)
    10751091/** @} */
    10761092
Note: See TracChangeset for help on using the changeset viewer.

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