Changeset 67142 in vbox for trunk/src

Timestamp:

May 30, 2017 2:11:46 PM (8 years ago)

Author:

vboxsync

Message:

ApplianceImpl*: Started implementing support for the new TAR creator backend.

Location:

trunk/src/VBox/Main

Files:

• include/ApplianceImpl.h (modified) (1 diff)
• include/ApplianceImplPrivate.h (modified) (2 diffs)
• src-server/ApplianceImplExport.cpp (modified) (8 diffs)
• src-server/ApplianceImplIO.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/ApplianceImpl.h

@@ -217 +217 @@
     HRESULT i_writeFSOVF(TaskOVF *pTask, AutoWriteLockBase& writeLock);
     HRESULT i_writeFSOVA(TaskOVF *pTask, AutoWriteLockBase& writeLock);
-    HRESULT i_writeFSImpl(TaskOVF *pTask, AutoWriteLockBase& writeLock, PVDINTERFACEIO pCallbacks, PSHASTORAGE pStorage);
+    HRESULT i_writeFSImpl(TaskOVF *pTask, AutoWriteLockBase &writeLock, RTVFSFSSTREAM hVfsFss,
+                          PVDINTERFACEIO pCallbacks, PSHASTORAGE pStorage);
 
     struct XMLStack;

trunk/src/VBox/Main/include/ApplianceImplPrivate.h

@@ -18 +18 @@
 #ifndef ____H_APPLIANCEIMPLPRIVATE
 #define ____H_APPLIANCEIMPLPRIVATE
+
+#ifdef DEBUG_bird
+# define MAIN_WITH_NEW_TAR_CREATOR
+#endif
 
 class VirtualSystemDescription;
@@ -436 +440 @@
 PVDINTERFACEIO tarWriterCreateInterface(void);
 
+int writeBufferToFile(const char *pszFilename, const void *pvContent, size_t cbContent, RTVFSFSSTREAM hVfsFss);
 int writeBufferToFile(const char *pcszFilename, void *pvBuf, size_t cbSize, PVDINTERFACEIO pIfIo, void *pvUser);
 

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

@@ -2026 +2026 @@
             break;
         }
-        rc = i_writeFSImpl(pTask, writeLock, pShaIo, &storage);
+        rc = i_writeFSImpl(pTask, writeLock, NIL_RTVFSFSSTREAM, pShaIo, &storage);
     } while (0);
 
@@ -2084 +2084 @@
             break;
         }
-        rc = i_writeFSImpl(pTask, writeLock, pShaIo, &storage);
+        rc = i_writeFSImpl(pTask, writeLock, NIL_RTVFSFSSTREAM, pShaIo, &storage);
     } while (0);
 
@@ -2103 +2103 @@
 }
 
-HRESULT Appliance::i_writeFSImpl(TaskOVF *pTask, AutoWriteLockBase& writeLock, PVDINTERFACEIO pIfIo, PSHASTORAGE pStorage)
+HRESULT Appliance::i_writeFSImpl(TaskOVF *pTask, AutoWriteLockBase& writeLock, RTVFSFSSTREAM hVfsFssOut,
+                                 PVDINTERFACEIO pIfIo, PSHASTORAGE pStorage)
 {
     LogFlowFuncEnter();
@@ -2137 +2138 @@
                                strOvfFile.c_str());
             /* Write the ovf file to disk. */
-            vrc = writeBufferToFile(strOvfFile.c_str(), pvBuf, cbSize, pIfIo, pStorage);
+            if (hVfsFssOut != NIL_RTVFSFSSTREAM)
+                vrc = writeBufferToFile(strOvfFile.c_str(), pvBuf, cbSize, hVfsFssOut);
+            else
+                vrc = writeBufferToFile(strOvfFile.c_str(), pvBuf, cbSize, pIfIo, pStorage);
             if (RT_FAILURE(vrc))
+
                 throw setError(VBOX_E_FILE_ERROR,
                                tr("Could not create OVF file '%s' (%Rrc)"),
@@ -2234 +2239 @@
                 if (pDiskEntry->type == VirtualSystemDescriptionType_HardDiskImage)
                 {
+                    /*
+                     * Export a disk image.
+                     */
                     ComObjPtr<Progress> pProgress2;
                     pProgress2.createObject();
@@ -2241 +2249 @@
                     if (FAILED(rc)) throw rc;
 
-                    rc = pSourceDisk->i_exportFile(strTargetFilePath.c_str(),
-                                                   format,
-                                                   MediumVariant_VmdkStreamOptimized,
-                                                   m->m_pSecretKeyStore,
-                                                   pIfIo,
-                                                   pStorage,
-                                                   pProgress2);
+                    if (hVfsFssOut != NIL_RTVFSFSSTREAM)
+                        rc = E_NOTIMPL; /** @todo Continue here later. Need to (1) wrap the FSS thing (in the caller?)
+                                         *        and (2) provide a push API for adding streams.  (RTVfsFsStrmAdd is a pull API,
+                                         *        in that it pulls in the data bytes itself.) */
+                    else
+                    {
+                        rc = pSourceDisk->i_exportFile(strTargetFilePath.c_str(),
+                                                       format,
+                                                       MediumVariant_VmdkStreamOptimized,
+                                                       m->m_pSecretKeyStore,
+                                                       pIfIo,
+                                                       pStorage,
+                                                       pProgress2);
+                    }
                     if (FAILED(rc)) throw rc;
 
@@ -2256 +2271 @@
                 else
                 {
-                    //copy/clone CD/DVD image
+                    /*
+                     * Copy CD/DVD/floppy image.
+                     */
                     Assert(pDiskEntry->type == VirtualSystemDescriptionType_CDROM);
 
-                    /* Read the ISO file and add one to OVA/OVF package */
+                    if (hVfsFssOut != NIL_RTVFSFSSTREAM)
                     {
+                        /* Open the source image and cast it to a VFS base object. */
+                        RTVFSFILE hVfsSrcFile;
+                        vrc = RTVfsFileOpenNormal(strSrcFilePath.c_str(),
+                                                  RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_NONE,
+                                                  &hVfsSrcFile);
+                        if (RT_FAILURE(vrc))
+                            throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                               tr("Could not create or open file '%s' (%Rrc)"), strSrcFilePath.c_str(), vrc);
+
+                        RTVFSOBJ hVfsSrc = RTVfsObjFromFile(hVfsSrcFile);
+                        RTVfsFileRelease(hVfsSrcFile);
+                        AssertStmt(hVfsSrc != NIL_RTVFSOBJ, throw VERR_INTERNAL_ERROR);
+
+                        /* Add it to the output stream.  This will pull in all the data from the object. */
+                        vrc = RTVfsFsStrmAdd(hVfsFssOut, strTargetFilePath.c_str(), hVfsSrc, 0 /*fFlags*/);
+                        RTVfsObjRelease(hVfsSrc);
+                        if (RT_FAILURE(vrc))
+                            throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,  tr("Error during copy CD/DVD image '%s' (%Rrc)"),
+                                               strSrcFilePath.c_str(), vrc);
+                    }
+                    else
+                    {
+                        /* Read the ISO file and add one to OVA/OVF package */
                         void *pvStorage;
                         RTFILE pFile = NULL;
@@ -2380 +2420 @@
             pStorage->fCreateDigest = false;
             /* Write the manifest file to disk. */
-            vrc = writeBufferToFile(strMfFilePath.c_str(), pvBuf, cbSize, pIfIo, pStorage);
+            if (hVfsFssOut != NIL_RTVFSFSSTREAM)
+                vrc = writeBufferToFile(strMfFilePath.c_str(), pvBuf, cbSize, hVfsFssOut);
+            else
+                vrc = writeBufferToFile(strMfFilePath.c_str(), pvBuf, cbSize, pIfIo, pStorage);
             RTMemFree(pvBuf);
             if (RT_FAILURE(vrc))

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

@@ -1229 +1229 @@
 }
 
+
+/**
+ * Writes a memory buffer to a file in the output file system stream.
+ *
+ * @returns IPRT status code.
+ * @param   pszFilename     The file name (w/ path if desired).
+ * @param   pvContent       Pointer to buffer containing the file content.
+ * @param   cbContent       Size of the content.
+ * @param   hVfsFss         The file system stream to add the file to.
+ */
+int writeBufferToFile(const char *pszFilename, const void *pvContent, size_t cbContent, RTVFSFSSTREAM hVfsFss)
+{
+    /*
+     * Create a VFS file around the memory, converting it to a base VFS object handle.
+     */
+    RTVFSFILE hVfsFile;
+    int rc = RTVfsFileFromBuffer(RTFILE_O_READ, pvContent, cbContent, &hVfsFile);
+    if (RT_SUCCESS(rc))
+    {
+        RTVFSOBJ hVfsObj = RTVfsObjFromFile(hVfsFile);
+        RTVfsFileRelease(hVfsFile);
+        AssertReturn(hVfsObj != NIL_RTVFSOBJ, VERR_INTERNAL_ERROR_2);
+
+        /*
+         * Add it to the stream.
+         */
+        rc = RTVfsFsStrmAdd(hVfsFss, pszFilename, hVfsObj, 0);
+        RTVfsObjRelease(hVfsObj);
+    }
+
+    return rc;
+}
+
 int writeBufferToFile(const char *pcszFilename, void *pvBuf, size_t cbSize, PVDINTERFACEIO pIfIo, void *pvUser)
 {