Changeset 74926 in vbox

Timestamp:

Oct 18, 2018 3:32:37 PM (6 years ago)

Author:

vboxsync

Message:

OCI: Get rid of the VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK switch which
is always true now. G/c VirtualBox references that were always NULL
in extpack.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/include/CloudProviderManagerImpl.h (modified) (3 diffs)
• src/VBox/Main/src-server/CloudProviderManagerImpl.cpp (modified) (3 diffs)
• src/VBox/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -779 +779 @@
 # Enables the extension pack feature.
 VBOX_WITH_EXTPACK = 1
-# Enables implementing cloud providers as part of an extension pack.
-VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK = 1
 # Enables separating code into the Oracle VM VirtualBox Extension Pack, dubbed PUEL.
 VBOX_WITH_EXTPACK_PUEL = 1

trunk/src/VBox/Main/Makefile.kmk

@@ -79 +79 @@
         $(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_NO_COMMANDS),VBOX_WITH_CLOUD_PROVIDERS_NO_COMMANDS,)
 

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

@@ -21 +21 @@
 
 #include "CloudProviderManagerWrap.h"
-#ifdef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK
+#ifdef VBOX_WITH_EXTPACK
 class ExtPackManager;
 #endif
@@ -38 +38 @@
     void uninit();
 
-#if defined(VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK) && defined(VBOX_WITH_EXTPACK)
+#ifdef VBOX_WITH_EXTPACK
     // Safe helpers, take care of caller and lock themselves.
     void i_refreshProviders();
@@ -54 +54 @@
 
 private:
-#ifdef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK
+#ifdef VBOX_WITH_EXTPACK
     ComObjPtr<ExtPackManager> mpExtPackMgr;
     uint64_t mcExtPackMgrUpdate;

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

@@ -61 +61 @@
     m_apCloudProviders.clear();
 
-#if defined(VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK) && defined(VBOX_WITH_EXTPACK)
+#ifdef VBOX_WITH_EXTPACK
     // Engage the extension pack manager and get all the implementations of
     // this class and all implemented cloud providers.
@@ -89 +89 @@
 }
 
-#if defined(VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK) && defined(VBOX_WITH_EXTPACK)
+#ifdef VBOX_WITH_EXTPACK
 void CloudProviderManager::i_refreshProviders()
 {
@@ -137 +137 @@
     }
 }
-#endif
+#endif  /* VBOX_WITH_EXTPACK */
 
 HRESULT CloudProviderManager::getProviders(std::vector<ComPtr<ICloudProvider> > &aProviders)

trunk/src/VBox/Makefile.kmk

@@ -38 +38 @@
  include $(PATH_SUB_CURRENT)/Devices/Makefile.kmk
  include $(PATH_SUB_CURRENT)/HostDrivers/Makefile.kmk
- ifdef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK
-  include $(PATH_SUB_CURRENT)/Main/Makefile.kmk
- endif
+ include $(PATH_SUB_CURRENT)/Main/Makefile.kmk
  include $(PATH_SUB_CURRENT)/Storage/Makefile.kmk
  include $(PATH_SUB_CURRENT)/ExtPacks/Makefile.kmk