Changeset 74092 in vbox for trunk/src

Timestamp:

Sep 5, 2018 6:29:21 PM (7 years ago)

Author:

vboxsync

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

124857

Message:

OCI: Fix for makefiles. Completely breaks execution with VBOX_WITH_CLOUD_PROVIDERS_NO_COMMANDS defined, which is intentional

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• src-server/ApplianceImplExport.cpp (modified) (5 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -77 +77 @@
         $(if $(VBOX_WITH_MIDL_PROXY_STUB),VBOX_WITH_MIDL_PROXY_STUB,) \
         $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,) \
-       $(if $(VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK),VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK,)
+        $(if $(VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK),VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK,) \
+        $(if $(VBOX_WITH_CLOUD_PROVIDERS_NO_COMMANDS),VBOX_WITH_CLOUD_PROVIDERS_NO_COMMANDS,)
 
 # Unconditionally enable the new semaphore key generation code

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

@@ -2371 +2371 @@
 HRESULT Appliance::i_writeFSOCI(TaskOCI *pTask)
 {
+    LogRel(("Appliance::i_writeFSOCI\n"));
+
     RT_NOREF(pTask); // XXX
     LogFlowFuncEnter();
-    int vrc = VINF_SUCCESS;
+
     HRESULT hrc = S_OK;
     ComPtr<ICloudProviderManager> cpm;
     hrc = mVirtualBox->COMGETTER(CloudProviderManager)(cpm.asOutParam());
-
     Utf8Str strProviderName("OCI");
     ComPtr<ICloudProvider> ociProvider;
@@ -2388 +2389 @@
 #ifndef VBOX_WITH_CLOUD_PROVIDERS_NO_COMMANDS
 
+    int vrc = VINF_SUCCESS;
     //fills by values from m->m_OciExportData
     //mostly all names(keys) come from official OCI API documentation (see LaunchInstance description)
@@ -2465 +2467 @@
         catch (...)
         {
-            LogRel(("Appliance::i_writeFSOCI(): get cought unknown exception\n"));
+            LogRel(("Appliance::i_writeFSOCI(): get caught unknown exception\n"));
         }
 
@@ -2471 +2473 @@
     }
 #else
+    LogRel(("Appliance::i_writeFSOCI(): #ifdef VBOX_WITH_CLOUD_PROVIDERS_NO_COMMANDS section \n"));
     if (SUCCEEDED(hrc))
     {
@@ -2476 +2479 @@
 
         if (m->virtualSystemDescriptions.size() == 1) {
-            cloudClient.exportVM(m->virtualSystemDescriptions.front(), pTask->pProgress);
+            cloudClient->ExportVM(m->virtualSystemDescriptions.front(), pTask->pProgress);
         } else {
             //TODO: fail here
-        }
-    }
+        }    }
 #endif