Changeset 38469 in vbox for trunk/src/VBox/Storage/testcase/tstVD-2.cpp

Timestamp:

Aug 16, 2011 10:34:32 AM (14 years ago)

Author:

vboxsync

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

73520

Message:

VD: Interface cleanup. Merge the two involved structures (generic interface descriptor and callback table) into one, remove the duplicated interface wrappers in the backends and move the interface definitions into separate headers separating public and private interfaces.

File:

• trunk/src/VBox/Storage/testcase/tstVD-2.cpp (modified) (3 diffs)

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

@@ -76 +76 @@
     return VINF_SUCCESS;
 }
-
-
-VDINTERFACECONFIG icc = {
-    sizeof(VDINTERFACECONFIG),
-    VDINTERFACETYPE_CONFIG,
-    tstAreKeysValid,
-    tstQuerySize,
-    tstQuery
-};
 
 static const char *tstVDDeviceType(VDTYPE enmType)
@@ -194 +185 @@
         RTPrintf("\n");
 
-        VDINTERFACE ic;
-        ic.cbSize = sizeof(ic);
-        ic.enmInterface = VDINTERFACETYPE_CONFIG;
-        ic.pCallbacks = &icc;
+        PVDINTERFACE pVDIfs = NULL;
+        VDINTERFACECONFIG ic;
+
+        ic.pfnAreKeysValid = tstAreKeysValid;
+        ic.pfnQuerySize    = tstQuerySize;
+        ic.pfnQuery        = tstQuery;
+
+        rc = VDInterfaceAdd(&ic.Core, "tstVD-2_Config", VDINTERFACETYPE_CONFIG,
+                            NULL, sizeof(VDINTERFACECONFIG), &pVDIfs);
+        AssertRC(rc);
+
         char *pszLocation, *pszName;
-        rc = aVDInfo[i].pfnComposeLocation(&ic, &pszLocation);
+        rc = aVDInfo[i].pfnComposeLocation(pVDIfs, &pszLocation);
         CHECK("pfnComposeLocation()");
         if (pszLocation)
@@ -210 +208 @@
             }
         }
-        rc = aVDInfo[i].pfnComposeName(&ic, &pszName);
+        rc = aVDInfo[i].pfnComposeName(pVDIfs, &pszName);
         CHECK("pfnComposeName()");
         if (pszName)