Changeset 81119 in vbox for trunk/src/VBox

Timestamp:

Oct 6, 2019 12:37:56 PM (5 years ago)

Author:

vboxsync

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

133746

Message:

bugref:9527. Added global weak reference of VirtualBox into ExtPack.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageCloud.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (7 diffs)
• Main/src-server/ApplianceImplExport.cpp (modified) (1 diff)
• Main/src-server/ApplianceImplImport.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageCloud.cpp

@@ -1306 +1306 @@
     ComPtr<IProgress> progress;
     CHECK_ERROR2_RET(hrc, oCloudClient,
-                     ExportImage(pImage, pVirtualBox, ComSafeArrayAsInParam(parameters), progress.asOutParam()),
+                     ExportImage(pImage, ComSafeArrayAsInParam(parameters), progress.asOutParam()),
                      RTEXITCODE_FAILURE);
     hrc = showProgress(progress);
@@ -1376 +1376 @@
     ComPtr<IProgress> progress;
     CHECK_ERROR2_RET(hrc, oCloudClient,
-                     ImportImage(Bstr(strImageId).raw(), pVirtualBox, ComSafeArrayAsInParam(parameters), progress.asOutParam()),
+                     ImportImage(Bstr(strImageId).raw(), ComSafeArrayAsInParam(parameters), progress.asOutParam()),
                      RTEXITCODE_FAILURE);
     hrc = showProgress(progress);

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp

@@ -420 +420 @@
             /* Read Cloud Client description form: */
             CVirtualSystemDescriptionForm comForm;
-            CProgress comImportDescriptionFormProgress = m_comCloudClient.GetImportDescriptionForm(comVBox, comDescription, comForm);
+            CProgress comImportDescriptionFormProgress = m_comCloudClient.GetImportDescriptionForm(comDescription, comForm);
             if (!m_comCloudClient.isOk())
             {

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

@@ -4119 +4119 @@
   <interface
     name="IVirtualSystemDescription" extends="$unknown"
-    uuid="ec49259c-1c50-4353-97a5-0fd92e2caac2"
+    uuid="01510f40-c196-4d26-b8db-4c8c389f1f82"
     wsmap="managed"
     reservedMethods="4" reservedAttributes="4"
@@ -4382 +4382 @@
       </param>
     </method>
+
   </interface>
 
@@ -26452 +26453 @@
         </desc>
       </param>
-      <param name="virtualBox" type="IVirtualBox" dir="in">
-        <desc>Reference to the server-side API root object.</desc>
-      </param>
     </method>
 
@@ -26494 +26492 @@
         import from OCI.
       </desc>
-      <param name="virtualBox" type="IVirtualBox" dir="in">
-        <desc>
-          Reference to the server-side API root object.
-        </desc>
-      </param>
       <param name="description" type="IVirtualSystemDescription" dir="in">
         <desc>
@@ -26523 +26516 @@
       <param name="description" type="IVirtualSystemDescription" dir="in">
         <desc>VirtualSystemDescription object which is describing a machine and all required parameters.</desc>
-      </param>
-      <param name="virtualBox" type="IVirtualBox" dir="in">
-        <desc>Reference to the server-side API root object.</desc>
       </param>
       <param name="progress" type="IProgress" dir="in">
@@ -26640 +26630 @@
         <desc>Reference to the existing VBox image.</desc>
       </param>
-      <param name="virtualBox" type="IVirtualBox" dir="in">
-        <desc>Reference to the server-side API root object.</desc>
-      </param>
       <param name="parameters" type="wstring" dir="in" safearray="yes">
         <desc>Each parameter in the array must be in the form "name=value".</desc>
@@ -26657 +26644 @@
       <param name="uid" type="wstring" dir="in">
         <desc>the id of image in the Cloud.</desc>
-      </param>
-      <param name="virtualBox" type="IVirtualBox" dir="in">
-        <desc>Reference to the server-side API root object.</desc>
       </param>
       <param name="parameters" type="wstring" dir="in" safearray="yes">

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

@@ -2323 +2323 @@
     {
         ComPtr<IVirtualBox> VBox(mVirtualBox);
-        hrc = cloudClient->ExportVM(m->virtualSystemDescriptions.front(), pTask->pProgress, VBox);
+        hrc = cloudClient->ExportVM(m->virtualSystemDescriptions.front(), pTask->pProgress);
     }
     else

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

@@ -1456 +1456 @@
              * The most simple way is to create a TAR archive. */
             hrc = cloudClient->ImportInstance(m->virtualSystemDescriptions.front(),
-                                              VBox,
                                               pProgress);
             if (FAILED(hrc))