Index: /trunk/include/VBox/vd-ifs.h
===================================================================
--- /trunk/include/VBox/vd-ifs.h	(revision 52021)
+++ /trunk/include/VBox/vd-ifs.h	(revision 52022)
@@ -988,138 +988,4 @@
 }
 
-/**
- * Query configuration, dynamically allocated (RTMemAlloc) zero terminated
- * character value - the memory is locked to prevent paging to disk,
- * useful for memory which holds keys, passwords, etc.
- *
- * @return  VBox status code.
- * @param   pCfgIf      Pointer to configuration callback table.
- * @param   pszName     Name of an zero terminated character value
- * @param   ppszString  Where to store the string pointer. Not set on failure.
- *                      Free this using RTMemFree().
- */
-DECLINLINE(int) VDCFGQueryStringAllocLocked(PVDINTERFACECONFIG pCfgIf,
-                                            const char *pszName, char **ppszString)
-{
-    size_t cb;
-    int rc = pCfgIf->pfnQuerySize(pCfgIf->Core.pvUser, pszName, &cb);
-    if (RT_SUCCESS(rc))
-    {
-        char *pszString = (char *)RTMemLockedAlloc(cb);
-        if (pszString)
-        {
-            rc = pCfgIf->pfnQuery(pCfgIf->Core.pvUser, pszName, pszString, cb);
-            if (RT_SUCCESS(rc))
-                *ppszString = pszString;
-            else
-                RTMemFree(pszString);
-        }
-        else
-            rc = VERR_NO_MEMORY;
-    }
-    return rc;
-}
-
-/**
- * Query configuration, dynamically allocated (RTMemAlloc) zero terminated
- * character value with default - the memory is locked to prevent paging to disk,
- * useful for memory which holds keys, passwords, etc.
- *
- * @return  VBox status code.
- * @param   pCfgIf      Pointer to configuration callback table.
- * @param   pszName     Name of an zero terminated character value
- * @param   ppszString  Where to store the string pointer. Not set on failure.
- *                      Free this using RTMemFree().
- * @param   pszDef      The default value.
- */
-DECLINLINE(int) VDCFGQueryStringAllocLockedDef(PVDINTERFACECONFIG pCfgIf,
-                                               const char *pszName,
-                                               char **ppszString,
-                                               const char *pszDef)
-{
-    size_t cb;
-    int rc = pCfgIf->pfnQuerySize(pCfgIf->Core.pvUser, pszName, &cb);
-    if (rc == VERR_CFGM_VALUE_NOT_FOUND || rc == VERR_CFGM_NO_PARENT)
-    {
-        cb = strlen(pszDef) + 1;
-        rc = VINF_SUCCESS;
-    }
-    if (RT_SUCCESS(rc))
-    {
-        char *pszString = (char *)RTMemLockedAlloc(cb);
-        if (pszString)
-        {
-            rc = pCfgIf->pfnQuery(pCfgIf->Core.pvUser, pszName, pszString, cb);
-            if (rc == VERR_CFGM_VALUE_NOT_FOUND || rc == VERR_CFGM_NO_PARENT)
-            {
-                memcpy(pszString, pszDef, cb);
-                rc = VINF_SUCCESS;
-            }
-            if (RT_SUCCESS(rc))
-                *ppszString = pszString;
-            else
-                RTMemFree(pszString);
-        }
-        else
-            rc = VERR_NO_MEMORY;
-    }
-    return rc;
-}
-
-/**
- * Query configuration, dynamically allocated (RTMemAlloc) byte string value -
- * the memory is locked to prevent paging to disk, useful for memory which holds
- * keys, passwords, etc..
- *
- * @return  VBox status code.
- * @param   pCfgIf      Pointer to configuration callback table.
- * @param   pszName     Name of an zero terminated character value
- * @param   ppvData     Where to store the byte string pointer. Not set on failure.
- *                      Free this using RTMemFree().
- * @param   pcbData     Where to store the byte string length.
- */
-DECLINLINE(int) VDCFGQueryBytesAllocLocked(PVDINTERFACECONFIG pCfgIf,
-                                           const char *pszName, void **ppvData, size_t *pcbData)
-{
-    size_t cb;
-    int rc = pCfgIf->pfnQuerySize(pCfgIf->Core.pvUser, pszName, &cb);
-    if (RT_SUCCESS(rc))
-    {
-        char *pbData;
-        Assert(cb);
-
-        pbData = (char *)RTMemLockedAlloc(cb);
-        if (pbData)
-        {
-            if(pCfgIf->pfnQueryBytes)
-                rc = pCfgIf->pfnQueryBytes(pCfgIf->Core.pvUser, pszName, pbData, cb);
-            else
-                rc = pCfgIf->pfnQuery(pCfgIf->Core.pvUser, pszName, pbData, cb);
-
-            if (RT_SUCCESS(rc))
-            {
-                *ppvData = pbData;
-                /* Exclude terminator if the byte data was obtained using the string query callback. */
-                *pcbData = cb;
-                if (!pCfgIf->pfnQueryBytes)
-                    (*pcbData)--;
-            }
-            else
-                RTMemFree(pbData);
-        }
-        else
-            rc = VERR_NO_MEMORY;
-    }
-    return rc;
-}
-
-/**
- * Frees memory allocated using one of the VDCFGQuery*AllocLocked methods.
- */
-DECLINLINE(void) VDCFGMemLockedFree(void *pvData)
-{
-    RTMemLockedFree(pvData);
-}
-
 /** Forward declaration of a VD socket. */
 typedef struct VDSOCKETINT *VDSOCKET;