Index: /trunk/src/VBox/Storage/VD.cpp
===================================================================
--- /trunk/src/VBox/Storage/VD.cpp	(revision 64764)
+++ /trunk/src/VBox/Storage/VD.cpp	(revision 64765)
@@ -3597,8 +3597,8 @@
  * Checks whether the given plugin filename was already loaded.
  *
- * @returns true if the plugin was already loaded, false otherwise.
+ * @returns Pointer to already loaded plugin, NULL if not found.
  * @param   pszFilename    The filename to check.
  */
-static bool vdPluginFind(const char *pszFilename)
+static PVDPLUGIN vdPluginFind(const char *pszFilename)
 {
     PVDPLUGIN pIt = NULL;
@@ -3607,8 +3607,8 @@
     {
         if (!RTStrCmp(pIt->pszFilename, pszFilename))
-            return true;
-    }
-
-    return false;
+            return pIt;
+    }
+
+    return NULL;
 }
 
@@ -3646,10 +3646,5 @@
 {
     /* Find plugin to be removed from the list. */
-    PVDPLUGIN pIt = NULL;
-    RTListForEach(&g_ListPluginsLoaded, pIt, VDPLUGIN, NodePlugin)
-    {
-        if (!RTStrCmp(pIt->pszFilename, pszFilename))
-            break;
-    }
+    PVDPLUGIN pIt = vdPluginFind(pszFilename);
     if (!pIt)
         return VINF_SUCCESS;