Changeset 84153 in vbox for trunk/src/VBox/Main

Timestamp:

May 5, 2020 8:00:32 PM (5 years ago)

Author:

vboxsync

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

137753

Message:

Main: Reverted r137602 & r137737 as the API is not actually needed. bugref:9699

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (3 diffs)
• include/ApplianceImpl.h (modified) (1 diff)
• include/ApplianceImplPrivate.h (modified) (4 diffs)
• src-server/ApplianceImpl.cpp (modified) (1 diff)
• src-server/ApplianceImplImport.cpp (modified) (3 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -3510 +3510 @@
       addresses, if the import options are used to keep them.</desc>
     </const>
+
   </enum>
 
@@ -3633 +3634 @@
     uuid="86a98347-7619-41aa-aece-b21ac5c1a7e6"
     wsmap="managed"
-    reservedMethods="6" reservedAttributes="8"
+    reservedMethods="7" reservedAttributes="8"
     >
     <desc>
@@ -3780 +3781 @@
       </desc>
     </attribute>
-
-    <method name="getManifest">
-      <desc>
-        Return manifest represented in the OVF and type of digest used there.
-      </desc>
-      <param name="manifest" type="wstring" dir="out">
-        <desc>
-          The manifest represented in the OVF. Empty if not exist.
-          This is available after calling <link to="#read"/>.
-        </desc>
-      </param>
-      <param name="manifestName" type="wstring" dir="out">
-        <desc>
-          The manifest file name. Empty if not exist.
-        </desc>
-      </param>
-
-    </method>
 
     <method name="read">

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

@@ -93 +93 @@
     HRESULT getVirtualSystemDescriptions(std::vector<ComPtr<IVirtualSystemDescription> > &aVirtualSystemDescriptions);
     HRESULT getMachines(std::vector<com::Utf8Str> &aMachines);
-
-    HRESULT getManifest(com::Utf8Str &aManifest, com::Utf8Str &aManifestName);
 
     // wrapped IAppliance methods

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

@@ -133 +133 @@
             cbSignedDigest = 0;
         }
-
         if (fSignerCertLoaded)
         {
@@ -149 +148 @@
         ptrCertificateInfo.setNull();
         strCertError.setNull();
-        strManifestName.setNull();
     }
 
@@ -163 +161 @@
     /** @name Write data
      * @{ */
-    bool                fManifest;     // Create a manifest file on export
+    bool                fManifest;      // Create a manifest file on export
     /** @} */
 
@@ -178 +176 @@
     /** Memorized copy of the manifest file for signature checking purposes. */
     RTVFSFILE           hMemFileTheirManifest;
-    /** The manifest filename. */
-    Utf8Str             strManifestName;
 
     /** The signer certificate from the signature file (.cert).

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

@@ -505 +505 @@
  * Public method implementation.
  */
-HRESULT Appliance::getManifest(com::Utf8Str &aManifest, com::Utf8Str &aManifestName)
-{
-    /* Write lock the appliance here as we don't want concurrent hMemFileTheirManifest
-       accesses (lazyness/paranoia). */
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    Assert(aManifest.isEmpty());
-    if (m->hMemFileTheirManifest != NIL_RTVFSFILE)
-    {
-        uint64_t cchManifest = 0;
-        int rc = RTVfsFileQuerySize(m->hMemFileTheirManifest, &cchManifest);
-        AssertRCReturn(rc, setErrorVrc(rc));
-
-        rc = aManifest.reserveNoThrow(cchManifest + 1);
-        AssertRCReturn(rc, setErrorVrc(rc));
-
-        char *pszManifest = aManifest.mutableRaw();
-        rc = RTVfsFileReadAt(m->hMemFileTheirManifest, 0, pszManifest, cchManifest, NULL);
-        pszManifest[cchManifest] = '\0';
-        AssertRCReturn(rc, setErrorVrc(rc));
-        RTStrPurgeEncoding(pszManifest);
-        aManifest.jolt();
-    }
-
-    aManifestName = m->strManifestName;
-    return S_OK;
-}
-
-/**
- * Public method implementation.
- */
 HRESULT Appliance::getDisks(std::vector<com::Utf8Str> &aDisks)
 {

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

@@ -2561 +2561 @@
  *                              reference is always consumed.
  * @param   pszSubFileNm        The manifest filename (no path) for error
- *                              messages, logging and strManifestName.
+ *                              messages and logging.
  * @returns COM status code, error info set.
  * @throws  Nothing
@@ -2568 +2568 @@
 {
     LogFlowFunc(("%s[%s]\n", pTask->locInfo.strPath.c_str(), pszSubFileNm));
-
-    /* Remember the manifet file name */
-    HRESULT hrc = m->strManifestName.assignEx(pszSubFileNm);
-    AssertReturn(SUCCEEDED(hrc), hrc);
 
     /*
@@ -2595 +2591 @@
     RTVfsIoStrmRelease(hVfsIos);
     if (RT_FAILURE(vrc))
-        return setErrorVrc(vrc, tr("Failed to parse manifest file '%s' for '%s' (%Rrc): %s"),
-                           pszSubFileNm, pTask->locInfo.strPath.c_str(), vrc, szErr);
+        throw setErrorVrc(vrc, tr("Failed to parse manifest file '%s' for '%s' (%Rrc): %s"),
+                          pszSubFileNm, pTask->locInfo.strPath.c_str(), vrc, szErr);
 
     /*