Changeset 11484 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Aug 19, 2008 12:41:38 PM (16 years ago)

Author:

vboxsync

Message:

Storage/VBoxHDD-new: Add information about configuration settings supported by a backend.
Storage/iSCSI: Move initiator name default to backend.
Main: Move iSCSI initiator name default to backend.

Location:

trunk/src/VBox/Devices/Storage

Files:

• RawHDDCore.cpp (modified) (1 diff)
• VBoxHDD-new.cpp (modified) (3 diffs)
• VBoxHDD-newInternal.h (modified) (1 diff)
• VDIHDDCore.cpp (modified) (1 diff)
• VmdkHDDCore.cpp (modified) (1 diff)
• testcase/tstVD-2.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/RawHDDCore.cpp

@@ -1087 +1087 @@
     /* papszFileExtensions */
     s_apszRawFileExtensions,
+    /* paConfigInfo */
+    NULL,
     /* pfnCheckIfValid */
     rawCheckIfValid,

trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp

@@ -653 +653 @@
             pEntries[cEntries].uBackendCaps = aBackends[i]->uBackendCaps;
             pEntries[cEntries].papszFileExtensions = aBackends[i]->papszFileExtensions;
+            pEntries[cEntries].paConfigInfo = aBackends[i]->paConfigInfo;
             cEntries++;
             if (cEntries >= cEntriesAlloc)
@@ -742 +743 @@
                         pEntries[cEntries].uBackendCaps = pBackend->uBackendCaps;
                         pEntries[cEntries].papszFileExtensions = pBackend->papszFileExtensions;
+                        pEntries[cEntries].paConfigInfo = pBackend->paConfigInfo;
                         cEntries++;
                         if (cEntries >= cEntriesAlloc)
@@ -2983 +2985 @@
             pBackendInfo->uBackendCaps = pImage->Backend->uBackendCaps;
             pBackendInfo->papszFileExtensions = pImage->Backend->papszFileExtensions;
+            pBackendInfo->paConfigInfo = pImage->Backend->paConfigInfo;
             rc = VINF_SUCCESS;
         }

trunk/src/VBox/Devices/Storage/VBoxHDD-newInternal.h

@@ -62 +62 @@
      */
     const char * const *papszFileExtensions;
+
+    /**
+     * Pointer to an array of structs describing each supported config key.
+     * Terminated by a NULL config key. Note that some backends do not support
+     * the configuration interface, so this pointer may just contain NULL.
+     * Mandatory if the backend sets VD_CAP_CONFIG.
+     */
+    PCVDCONFIGINFO paConfigInfo;
 
     /**

trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp

@@ -1822 +1822 @@
     /* papszFileExtensions */
     s_apszVdiFileExtensions,
+    /* paConfigInfo */
+    NULL,
     /* pfnCheckIfValid */
     vdiCheckIfValid,

trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp

@@ -5182 +5182 @@
     /* papszFileExtensions */
     s_apszVmdkFileExtensions,
+    /* paConfigInfo */
+    NULL,
     /* pfnCheckIfValid */
     vmdkCheckIfValid,

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

@@ -72 +72 @@
             if (papsz == aVDInfo[i].papszFileExtensions)
                 RTPrintf("<EMPTY>");
-            RTPrintf("\n");
         }
         else
-            RTPrintf("<NONE>\n");
+            RTPrintf("<NONE>");
+        RTPrintf(" config=");
+        if (aVDInfo[i].paConfigInfo)
+        {
+            PCVDCONFIGINFO pa = aVDInfo[i].paConfigInfo;
+            while (pa->pszKey != NULL)
+            {
+                if (pa != aVDInfo[i].paConfigInfo)
+                    RTPrintf(",");
+                RTPrintf("(key=%s type=", pa->pszKey);
+                switch (pa->enmValueType)
+                {
+                    case VDCFGVALUETYPE_INTEGER:
+                        RTPrintf("integer default=");
+                        if (pa->pDefaultValue)
+                            RTPrintf("%RU64", pa->pDefaultValue->Integer.u64);
+                        else
+                            RTPrintf("<NONE>");
+                        break;
+                    case VDCFGVALUETYPE_STRING:
+                        RTPrintf("string default=");
+                        if (pa->pDefaultValue)
+                            RTPrintf("%s", pa->pDefaultValue->String.psz);
+                        else
+                            RTPrintf("<NONE>");
+                        break;
+                    case VDCFGVALUETYPE_BYTES:
+                        RTPrintf("bytes default=");
+                        if (pa->pDefaultValue)
+                            RTPrintf("length=%RTuint %.*Rhxs",
+                                     pa->pDefaultValue->Bytes.cb,
+                                     pa->pDefaultValue->Bytes.cb,
+                                     pa->pDefaultValue->Bytes.pv);
+                        else
+                            RTPrintf("<NONE>");
+                        break;
+                    default:
+                        RTPrintf("INVALID!");
+                }
+                RTPrintf(" flags=");
+                if (!pa->uKeyFlags)
+                    RTPrintf("none");
+                unsigned cFlags = 0;
+                if (pa->uKeyFlags & VD_CFGKEY_MANDATORY)
+                {
+                    if (cFlags)
+                        RTPrintf(",");
+                    RTPrintf("mandatory");
+                    cFlags++;
+                }
+                if (pa->uKeyFlags & VD_CFGKEY_EXPERT)
+                {
+                    if (cFlags)
+                        RTPrintf(",");
+                    RTPrintf("expert");
+                    cFlags++;
+                }
+                RTPrintf(")");
+                pa++;
+            }
+            if (pa == aVDInfo[i].paConfigInfo)
+                RTPrintf("<EMPTY>");
+        }
+        else
+            RTPrintf("<NONE>");
+        RTPrintf("\n");
     }