Changeset 51105 in vbox for trunk

Timestamp:

Apr 18, 2014 10:18:56 AM (11 years ago)

Author:

vboxsync

Message:

Missing files for previous commit

Location:

trunk

Files:

• include/VBox/err.h (modified) (2 diffs)
• src/VBox/Storage/ISCSI.cpp (modified) (4 diffs)

trunk/include/VBox/err.h

@@ -1523 +1523 @@
 /** The image is too small or too large for this format. */
 #define VERR_VD_INVALID_SIZE                        (-3211)
+/** Configuration value is unknown. This indicates misconfiguration. */
+#define VERR_VD_UNKNOWN_CFG_VALUES                  (-3212)
+/** Interface is unknown. This indicates misconfiguration. */
+#define VERR_VD_UNKNOWN_INTERFACE                   (-3213)
 /** Generic: Invalid image file header. Use this for plugins. */
 #define VERR_VD_GEN_INVALID_HEADER                  (-3220)
@@ -1547 +1551 @@
 /** iSCSI: Invalid header, i.e. dummy for validity check. */
 #define VERR_VD_ISCSI_INVALID_HEADER                (-3250)
-/** iSCSI: Configuration value is unknown. This indicates misconfiguration. */
-#define VERR_VD_ISCSI_UNKNOWN_CFG_VALUES            (-3251)
-/** iSCSI: Interface is unknown. This indicates misconfiguration. */
-#define VERR_VD_ISCSI_UNKNOWN_INTERFACE             (-3252)
 /** iSCSI: Operation can't be done in current image state. */
-#define VERR_VD_ISCSI_INVALID_STATE                 (-3253)
+#define VERR_VD_ISCSI_INVALID_STATE                 (-3251)
 /** iSCSI: Invalid device type (not a disk). */
-#define VERR_VD_ISCSI_INVALID_TYPE                  (-3254)
+#define VERR_VD_ISCSI_INVALID_TYPE                  (-3252)
 /** iSCSI: Initiator secret not decrypted */
-#define VERR_VD_ISCSI_SECRET_ENCRYPTED              (-3255)
+#define VERR_VD_ISCSI_SECRET_ENCRYPTED              (-3253)
 /** VHD: Invalid image file header. */
 #define VERR_VD_VHD_INVALID_HEADER                  (-3260)

trunk/src/VBox/Storage/ISCSI.cpp

@@ -3844 +3844 @@
     if (!pImage->pIfNet)
     {
-        rc = vdIfError(pImage->pIfError, VERR_VD_ISCSI_UNKNOWN_INTERFACE,
+        rc = vdIfError(pImage->pIfError, VERR_VD_UNKNOWN_INTERFACE,
                        RT_SRC_POS, N_("iSCSI: TCP network stack interface missing"));
         goto out;
@@ -3853 +3853 @@
     if (!pImage->pIfConfig)
     {
-        rc = vdIfError(pImage->pIfError, VERR_VD_ISCSI_UNKNOWN_INTERFACE,
+        rc = vdIfError(pImage->pIfError, VERR_VD_UNKNOWN_INTERFACE,
                        RT_SRC_POS, N_("iSCSI: configuration interface missing"));
         goto out;
@@ -3862 +3862 @@
     if (!pImage->pIfIo)
     {
-        rc = vdIfError(pImage->pIfError, VERR_VD_ISCSI_UNKNOWN_INTERFACE,
+        rc = vdIfError(pImage->pIfError, VERR_VD_UNKNOWN_INTERFACE,
                        RT_SRC_POS, N_("iSCSI: I/O interface missing"));
         goto out;
@@ -3904 +3904 @@
                            "DumpMalformedPackets\0"))
     {
-        rc = vdIfError(pImage->pIfError, VERR_VD_ISCSI_UNKNOWN_CFG_VALUES, RT_SRC_POS, N_("iSCSI: configuration error: unknown configuration keys present"));
+        rc = vdIfError(pImage->pIfError, VERR_VD_UNKNOWN_CFG_VALUES, RT_SRC_POS, N_("iSCSI: configuration error: unknown configuration keys present"));
         goto out;
     }