Changeset 63802 in vbox for trunk/src/VBox/Storage
- Timestamp:
- Sep 12, 2016 1:54:35 PM (8 years ago)
- Location:
- trunk/src/VBox/Storage
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Storage/DMG.cpp
r63786 r63802 1721 1721 1722 1722 1723 /** @interface_method_impl{VDIMAGEBACKEND,pfn CheckIfValid} */1724 static DECLCALLBACK(int) dmg CheckIfValid(const char *pszFilename, PVDINTERFACE pVDIfsDisk,1725 1723 /** @interface_method_impl{VDIMAGEBACKEND,pfnProbe} */ 1724 static DECLCALLBACK(int) dmgProbe(const char *pszFilename, PVDINTERFACE pVDIfsDisk, 1725 PVDINTERFACE pVDIfsImage, VDTYPE *penmType) 1726 1726 { 1727 1727 RT_NOREF1(pVDIfsDisk); … … 2416 2416 /* paConfigInfo */ 2417 2417 NULL, 2418 /* pfn CheckIfValid*/2419 dmg CheckIfValid,2418 /* pfnProbe */ 2419 dmgProbe, 2420 2420 /* pfnOpen */ 2421 2421 dmgOpen, -
trunk/src/VBox/Storage/ISCSI.cpp
r63785 r63802 4650 4650 4651 4651 4652 /** @copydoc VDIMAGEBACKEND::pfn CheckIfValid*/4653 static DECLCALLBACK(int) iscsi CheckIfValid(const char *pszFilename, PVDINTERFACE pVDIfsDisk,4654 4652 /** @copydoc VDIMAGEBACKEND::pfnProbe */ 4653 static DECLCALLBACK(int) iscsiProbe(const char *pszFilename, PVDINTERFACE pVDIfsDisk, 4654 PVDINTERFACE pVDIfsImage, VDTYPE *penmType) 4655 4655 { 4656 4656 RT_NOREF4(pszFilename, pVDIfsDisk, pVDIfsImage, penmType); … … 5590 5590 /* paConfigInfo */ 5591 5591 s_iscsiConfigInfo, 5592 /* p fnCheckIfValid*/5593 iscsi CheckIfValid,5592 /* prnProbe */ 5593 iscsiProbe, 5594 5594 /* pfnOpen */ 5595 5595 iscsiOpen, -
trunk/src/VBox/Storage/Parallels.cpp
r63783 r63802 341 341 } 342 342 343 /** @copydoc VDIMAGEBACKEND::p fnCheckIfValid*/344 static DECLCALLBACK(int) parallels CheckIfValid(const char *pszFilename, PVDINTERFACE pVDIfsDisk,345 343 /** @copydoc VDIMAGEBACKEND::prnProbe */ 344 static DECLCALLBACK(int) parallelsProbe(const char *pszFilename, PVDINTERFACE pVDIfsDisk, 345 PVDINTERFACE pVDIfsImage, VDTYPE *penmType) 346 346 { 347 347 RT_NOREF1(pVDIfsDisk); … … 1079 1079 /* paConfigInfo */ 1080 1080 NULL, 1081 /* pfn CheckIfValid*/1082 parallels CheckIfValid,1081 /* pfnProbe */ 1082 parallelsProbe, 1083 1083 /* pfnOpen */ 1084 1084 parallelsOpen, -
trunk/src/VBox/Storage/QCOW.cpp
r63793 r63802 1449 1449 } 1450 1450 1451 /** @copydoc VDIMAGEBACKEND::pfn CheckIfValid*/1452 static DECLCALLBACK(int) qcow CheckIfValid(const char *pszFilename, PVDINTERFACE pVDIfsDisk,1453 1451 /** @copydoc VDIMAGEBACKEND::pfnProbe */ 1452 static DECLCALLBACK(int) qcowProbe(const char *pszFilename, PVDINTERFACE pVDIfsDisk, 1453 PVDINTERFACE pVDIfsImage, VDTYPE *penmType) 1454 1454 { 1455 1455 RT_NOREF1(pVDIfsDisk); … … 2327 2327 /* paConfigInfo */ 2328 2328 NULL, 2329 /* pfn CheckIfValid*/2330 qcow CheckIfValid,2329 /* pfnProbe */ 2330 qcowProbe, 2331 2331 /* pfnOpen */ 2332 2332 qcowOpen, -
trunk/src/VBox/Storage/QED.cpp
r63792 r63802 1455 1455 } 1456 1456 1457 /** @copydoc VDIMAGEBACKEND::pfn CheckIfValid*/1458 static DECLCALLBACK(int) qed CheckIfValid(const char *pszFilename, PVDINTERFACE pVDIfsDisk,1459 1457 /** @copydoc VDIMAGEBACKEND::pfnProbe */ 1458 static DECLCALLBACK(int) qedProbe(const char *pszFilename, PVDINTERFACE pVDIfsDisk, 1459 PVDINTERFACE pVDIfsImage, VDTYPE *penmType) 1460 1460 { 1461 1461 RT_NOREF1(pVDIfsDisk); … … 2383 2383 /* paConfigInfo */ 2384 2384 NULL, 2385 /* pfn CheckIfValid*/2386 qed CheckIfValid,2385 /* pfnProbe */ 2386 qedProbe, 2387 2387 /* pfnOpen */ 2388 2388 qedOpen, -
trunk/src/VBox/Storage/RAW.cpp
r63784 r63802 286 286 287 287 288 /** @copydoc VDIMAGEBACKEND::pfn CheckIfValid*/289 static DECLCALLBACK(int) raw CheckIfValid(const char *pszFilename, PVDINTERFACE pVDIfsDisk,290 288 /** @copydoc VDIMAGEBACKEND::pfnProbe */ 289 static DECLCALLBACK(int) rawProbe(const char *pszFilename, PVDINTERFACE pVDIfsDisk, 290 PVDINTERFACE pVDIfsImage, VDTYPE *penmType) 291 291 { 292 292 RT_NOREF1(pVDIfsDisk); … … 969 969 /* paConfigInfo */ 970 970 NULL, 971 /* pfn CheckIfValid*/972 raw CheckIfValid,971 /* pfnProbe */ 972 rawProbe, 973 973 /* pfnOpen */ 974 974 rawOpen, -
trunk/src/VBox/Storage/VD.cpp
r63781 r63802 6247 6247 for (unsigned i = 0; i < g_cBackends; i++) 6248 6248 { 6249 if (g_apBackends[i]->pfnCheckIfValid) 6250 { 6251 rc = g_apBackends[i]->pfnCheckIfValid(pszFilename, pVDIfsDisk, 6252 pVDIfsImage, penmType); 6249 if (g_apBackends[i]->pfnProbe) 6250 { 6251 rc = g_apBackends[i]->pfnProbe(pszFilename, pVDIfsDisk, pVDIfsImage, penmType); 6253 6252 if ( RT_SUCCESS(rc) 6254 6253 /* The correct backend has been found, but there is a small -
trunk/src/VBox/Storage/VDI.cpp
r63785 r63802 1266 1266 } 1267 1267 1268 /** @copydoc VDIMAGEBACKEND::pfn CheckIfValid*/1269 static DECLCALLBACK(int) vdi CheckIfValid(const char *pszFilename, PVDINTERFACE pVDIfsDisk,1270 1268 /** @copydoc VDIMAGEBACKEND::pfnProbe */ 1269 static DECLCALLBACK(int) vdiProbe(const char *pszFilename, PVDINTERFACE pVDIfsDisk, 1270 PVDINTERFACE pVDIfsImage, VDTYPE *penmType) 1271 1271 { 1272 1272 LogFlowFunc(("pszFilename=\"%s\"\n", pszFilename)); … … 3175 3175 /* paConfigInfo */ 3176 3176 NULL, 3177 /* pfn CheckIfValid*/3178 vdi CheckIfValid,3177 /* pfnProbe */ 3178 vdiProbe, 3179 3179 /* pfnOpen */ 3180 3180 vdiOpen, -
trunk/src/VBox/Storage/VHD.cpp
r63794 r63802 1236 1236 1237 1237 1238 /** @interface_method_impl{VDIMAGEBACKEND,pfn CheckIfValid} */1239 static DECLCALLBACK(int) vhd CheckIfValid(const char *pszFilename, PVDINTERFACE pVDIfsDisk,1240 1238 /** @interface_method_impl{VDIMAGEBACKEND,pfnProbe} */ 1239 static DECLCALLBACK(int) vhdProbe(const char *pszFilename, PVDINTERFACE pVDIfsDisk, 1240 PVDINTERFACE pVDIfsImage, VDTYPE *penmType) 1241 1241 { 1242 1242 RT_NOREF1(pVDIfsDisk); … … 3023 3023 /* paConfigInfo */ 3024 3024 NULL, 3025 /* pfn CheckIfValid*/3026 vhd CheckIfValid,3025 /* pfnProbe */ 3026 vhdProbe, 3027 3027 /* pfnOpen */ 3028 3028 vhdOpen, -
trunk/src/VBox/Storage/VHDX.cpp
r63785 r63802 1751 1751 1752 1752 1753 /** @copydoc VDIMAGEBACKEND::pfn CheckIfValid*/1754 static DECLCALLBACK(int) vhdx CheckIfValid(const char *pszFilename, PVDINTERFACE pVDIfsDisk,1755 1753 /** @copydoc VDIMAGEBACKEND::pfnProbe */ 1754 static DECLCALLBACK(int) vhdxProbe(const char *pszFilename, PVDINTERFACE pVDIfsDisk, 1755 PVDINTERFACE pVDIfsImage, VDTYPE *penmType) 1756 1756 { 1757 1757 RT_NOREF1(pVDIfsDisk); … … 2499 2499 /* paConfigInfo */ 2500 2500 NULL, 2501 /* pfn CheckIfValid*/2502 vhdx CheckIfValid,2501 /* pfnProbe */ 2502 vhdxProbe, 2503 2503 /* pfnOpen */ 2504 2504 vhdxOpen, -
trunk/src/VBox/Storage/VMDK.cpp
r63801 r63802 5095 5095 5096 5096 5097 /** @copydoc VDIMAGEBACKEND::pfn CheckIfValid*/5098 static DECLCALLBACK(int) vmdk CheckIfValid(const char *pszFilename, PVDINTERFACE pVDIfsDisk,5099 5097 /** @copydoc VDIMAGEBACKEND::pfnProbe */ 5098 static DECLCALLBACK(int) vmdkProbe(const char *pszFilename, PVDINTERFACE pVDIfsDisk, 5099 PVDINTERFACE pVDIfsImage, VDTYPE *penmType) 5100 5100 { 5101 5101 LogFlowFunc(("pszFilename=\"%s\" pVDIfsDisk=%#p pVDIfsImage=%#p penmType=%#p\n", … … 6460 6460 /* paConfigInfo */ 6461 6461 NULL, 6462 /* pfn CheckIfValid*/6463 vmdk CheckIfValid,6462 /* pfnProbe */ 6463 vmdkProbe, 6464 6464 /* pfnOpen */ 6465 6465 vmdkOpen,
Note:
See TracChangeset
for help on using the changeset viewer.