Changeset 67184 in vbox for trunk/src/VBox/Main/src-server/MediumImpl.cpp

Timestamp:

May 31, 2017 8:32:04 PM (8 years ago)

Author:

vboxsync

Message:

Main: Reworking IAppliance export to use new TAR creator. Changes protected by VBOX_WITH_NEW_TAR_CREATOR define (currently not defined).

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -660 +660 @@
                MediumVariant_T aVariant,
                SecretKeyStore *pSecretKeyStore,
+#ifdef VBOX_WITH_NEW_TAR_CREATOR
+               RTVFSIOSTREAM aVfsIosDst,
+#else
                VDINTERFACEIO *aVDImageIOIf,
                void *aVDImageIOUser,
+#endif
                MediumLockList *aSourceMediumLockList,
                bool fKeepSourceMediumLockList = false)
@@ -675 +679 @@
 
         mVDImageIfaces = aMedium->m->vdImageIfaces;
+
+#ifdef VBOX_WITH_NEW_TAR_CREATOR
+        int vrc = VDIfCreateFromVfsStream(aVfsIosDst, RTFILE_O_WRITE, &mpVfsIoIf);
+        AssertRCReturnVoidStmt(vrc, mRC = E_FAIL);
+
+        vrc = VDInterfaceAdd(&mpVfsIoIf->Core, "Medium::ExportTaskVfsIos",
+                             VDINTERFACETYPE_IO, mpVfsIoIf,
+                             sizeof(VDINTERFACEIO), &mVDImageIfaces);
+        AssertRCReturnVoidStmt(vrc, mRC = E_FAIL);
+#else
+
         if (aVDImageIOIf)
         {
@@ -682 +697 @@
             AssertRCReturnVoidStmt(vrc, mRC = E_FAIL);
         }
+#endif
         m_strTaskName = "createExport";
     }
@@ -689 +705 @@
         if (!mfKeepSourceMediumLockList && mpSourceMediumLockList)
             delete mpSourceMediumLockList;
+#ifdef VBOX_WITH_NEW_TAR_CREATOR
+        if (mpVfsIoIf)
+        {
+            VDIfDestroyFromVfsStream(mpVfsIoIf);
+            mpVfsIoIf = NULL;
+        }
+#endif
     }
 
@@ -696 +719 @@
     MediumVariant_T mVariant;
     PVDINTERFACE mVDImageIfaces;
+    PVDINTERFACEIO mpVfsIoIf; /**< Pointer to the VFS I/O stream to VD I/O interface wrapper. */
     SecretKeyStore *m_pSecretKeyStore;
 
@@ -6096 +6120 @@
                              MediumVariant_T aVariant,
                              SecretKeyStore *pKeyStore,
+#ifdef VBOX_WITH_NEW_TAR_CREATOR
+                             RTVFSIOSTREAM hVfsIosDst,
+#else
                              PVDINTERFACEIO aVDImageIOIf, void *aVDImageIOUser,
+#endif
                              const ComObjPtr<Progress> &aProgress)
 {
@@ -6136 +6164 @@
 
         /* setup task object to carry out the operation asynchronously */
-        pTask = new Medium::ExportTask(this, aProgress, aFilename, aFormat,
-                                       aVariant, pKeyStore, aVDImageIOIf,
-                                       aVDImageIOUser, pSourceMediumLockList);
+        pTask = new Medium::ExportTask(this, aProgress, aFilename, aFormat, aVariant,
+#ifdef VBOX_WITH_NEW_TAR_CREATOR
+                                       pKeyStore, hVfsIosDst, pSourceMediumLockList);
+#else
+                                       pKeyStore, aVDImageIOIf, aVDImageIOUser, pSourceMediumLockList);
+#endif
         rc = pTask->rc();
         AssertComRC(rc);