Changeset 14960 in vbox for trunk/src

Timestamp:

Dec 3, 2008 9:26:46 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

40321

Message:

backed out r40315 as it breaks the tinderboxes

Location:

trunk/src/VBox/Devices/Storage

Files:

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

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

@@ -1167 +1167 @@
     rawAsyncRead,
     /* pfnAsyncWrite */
-    rawAsyncWrite,
-    /* pfnComposeLocation */
-    genericFileComposeLocation,
-    /* pfnComposeName */
-    genericFileComposeName
+    rawAsyncWrite
 };
 

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

@@ -761 +761 @@
     }
 
-    for (unsigned i = 0; i < g_cBackends; i++)
-    {
-        pEntries[i].pszBackend = g_apBackends[i]->pszBackendName;
-        pEntries[i].uBackendCaps = g_apBackends[i]->uBackendCaps;
-        pEntries[i].papszFileExtensions = g_apBackends[i]->papszFileExtensions;
-        pEntries[i].pfnComposeLocation = g_apBackends[i]->pfnComposeLocation;
-        pEntries[i].pfnComposeName = g_apBackends[i]->pfnComposeName;
-    }
+     for (unsigned i = 0; i < g_cBackends; i++)
+     {
+         pEntries[i].pszBackend = g_apBackends[i]->pszBackendName;
+         pEntries[i].uBackendCaps = g_apBackends[i]->uBackendCaps;
+         pEntries[i].papszFileExtensions = g_apBackends[i]->papszFileExtensions;
+         pEntries[i].paConfigInfo = g_apBackends[i]->paConfigInfo;
+     }
 
     LogFlowFunc(("returns %Rrc *pcEntriesUsed=%u\n", rc, cEntries));
@@ -3553 +3552 @@
 }
 
-#if 0
-/** @copydoc VBOXHDDBACKEND::pfnComposeLocation */
-int genericFileComposeLocation(PVDINTERFACE pConfig, char **pszLocation)
-{
-    return NULL;
-}
-
-
-/** @copydoc VBOXHDDBACKEND::pfnComposeName */
-int genericFileComposeName(PVDINTERFACE pConfig, char **pszName)
-{
-    return NULL;
-}
-#endif

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

@@ -494 +494 @@
                                               PPDMDATASEG paSeg, unsigned cSeg, void *pvUser));
 
-    /** Returns a human readable hard disk location string given a
-     *  set of hard disk configuration keys. The returned string is an
-     *  equivalent of the full file path for image-based hard disks.
-     *  Mandatory for backends with no VD_CAP_FILE and NULL otherwise. */
-    DECLR3CALLBACKMEMBER(int, pfnComposeLocation, (PVDINTERFACE pConfig, char **pszLocation));
-
-    /** Returns a human readable hard disk name string given a
-     *  set of hard disk configuration keys. The returned string is an
-     *  equivalent of the file name part in the full file path for
-     *  image-based hard disks. Mandatory for backends with no
-     *  VD_CAP_FILE and NULL otherwise. */
-    DECLR3CALLBACKMEMBER(int, pfnComposeName, (PVDINTERFACE pConfig, char **pszName));
-
 } VBOXHDDBACKEND;
 
@@ -514 +501 @@
 /** Constant pointer to VD backend. */
 typedef const VBOXHDDBACKEND *PCVBOXHDDBACKEND;
-
-/** @copydoc VBOXHDDBACKEND::pfnComposeLocation */
-DECLINLINE(int) genericFileComposeLocation(PVDINTERFACE pConfig, char **pszLocation)
-{
-    *pszLocation = NULL;
-    return VINF_SUCCESS;
-}
-/** @copydoc VBOXHDDBACKEND::pfnComposeName */
-DECLINLINE(int) genericFileComposeName(PVDINTERFACE pConfig, char **pszName)
-{
-    *pszName = NULL;
-    return VINF_SUCCESS;
-}
 
 /** Initialization entry point. */

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

@@ -1946 +1946 @@
     vdiAsyncRead,
     /* pfnAsyncWrite */
-    vdiAsyncWrite,
-    /* pfnComposeLocation */
-    genericFileComposeLocation,
-    /* pfnComposeName */
-    genericFileComposeName
+    vdiAsyncWrite
 };
 

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

@@ -1952 +1952 @@
     vhdAsyncRead,
     /* pfnAsyncWrite */
-    vhdAsyncWrite,
-    /* pfnComposeLocation */
-    genericFileComposeLocation,
-    /* pfnComposeName */
-    genericFileComposeName
+    vhdAsyncWrite
 };

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

@@ -5394 +5394 @@
     vmdkAsyncRead,
     /* pfnAsyncWrite */
-    vmdkAsyncWrite,
-    /* pfnComposeLocation */
-    genericFileComposeLocation,
-    /* pfnComposeName */
-    genericFileComposeName
+    vmdkAsyncWrite
 };

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

@@ -37 +37 @@
 unsigned g_cErrors = 0;
 
-static struct KeyValuePair {
-    const char *key;
-    const char *value;
-} aCfgNode[] = {
-    { "TargetName", "test" },
-    { "LUN", "1" },
-    { "TargetAddress", "address" },
-    { NULL, NULL }
-};
-
-static bool tstAreKeysValid(void *pvUser, const char *pszzValid)
-{
-    return true;
-}
-
-static const char *tstGetValueByKey(const char *pszKey)
-{
-    for (int i = 0; aCfgNode[i].key; i++) 
-        if (!strcmp(aCfgNode[i].key, pszKey))
-            return aCfgNode[i].value;
-    return NULL;
-}
-
-static int tstQuerySize(void *pvUser, const char *pszName, size_t *pcbValue)
-{
-    const char *pszValue = tstGetValueByKey(pszName);
-    if (!pszValue)
-        return VERR_CFGM_VALUE_NOT_FOUND;
-    *pcbValue = strlen(pszValue) + 1;
-    return VINF_SUCCESS;
-}
-
-static int tstQuery(void *pvUser, const char *pszName, char *pszValue, size_t cchValue)
-{
-    const char *pszTmp = tstGetValueByKey(pszName);
-    if (!pszValue)
-        return VERR_CFGM_VALUE_NOT_FOUND;
-    size_t cchTmp = strlen(pszTmp) + 1; 
-    if (cchValue < cchTmp)
-        return VERR_CFGM_NOT_ENOUGH_SPACE;
-    memcpy(pszValue, pszTmp, cchTmp);
-    return VINF_SUCCESS;
-}
-
-
-VDINTERFACECONFIG icc = {
-    sizeof(VDINTERFACECONFIG),
-    VDINTERFACETYPE_CONFIG,
-    tstAreKeysValid,
-    tstQuerySize,
-    tstQuery
-};
 
 static int tstVDBackendInfo(void)
@@ -181 +129 @@
             RTPrintf("<NONE>");
         RTPrintf("\n");
-
-        VDINTERFACE ic;
-        ic.cbSize = sizeof(ic);
-        ic.enmInterface = VDINTERFACETYPE_CONFIG;
-        ic.pCallbacks = &icc;
-        char *pszLocation, *pszName;
-        rc = aVDInfo[i].pfnComposeLocation(&ic, &pszLocation);
-        CHECK("pfnComposeLocation()");
-        if (pszLocation)
-        {
-            RTMemFree(pszLocation);
-            if (aVDInfo[i].uBackendCaps & VD_CAP_FILE)
-            {
-                RTPrintf("Non-NULL location returned for file-based backend!\n");
-                return VERR_INTERNAL_ERROR;
-            }
-        }
-        rc = aVDInfo[i].pfnComposeName(&ic, &pszName);
-        CHECK("pfnComposeName()");
-        if (pszName)
-        {
-            RTMemFree(pszName);
-            if (aVDInfo[i].uBackendCaps & VD_CAP_FILE)
-            {
-                RTPrintf("Non-NULL name returned for file-based backend!\n");
-                return VERR_INTERNAL_ERROR;
-            }
-        }
     }