Changeset 83170 in vbox

Timestamp:

Feb 27, 2020 10:10:47 AM (5 years ago)

Author:

vboxsync

Message:

Build fixes for r136290.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageCloud.cpp (modified) (1 diff)
• Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)
• Main/src-server/MachineImpl.cpp (modified) (3 diffs)
• Main/xml/Settings.cpp (modified) (1 diff)

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

@@ -1618 +1618 @@
 
     if (options.fEnable)
+    {
         CHECK_ERROR2_RET(hrc, cloudNetwork, COMSETTER(Enabled)(TRUE), RTEXITCODE_FAILURE);
+    }
     if (options.fDisable)
+    {
         CHECK_ERROR2_RET(hrc, cloudNetwork, COMSETTER(Enabled)(FALSE), RTEXITCODE_FAILURE);
+    }
     if (options.strNetworkId.isNotEmpty())
+    {
         CHECK_ERROR2_RET(hrc, cloudNetwork, COMSETTER(NetworkId)(options.strNetworkId.raw()), RTEXITCODE_FAILURE);
+    }
     if (strProvider.isNotEmpty())
+    {
         CHECK_ERROR2_RET(hrc, cloudNetwork, COMSETTER(Provider)(strProvider.raw()), RTEXITCODE_FAILURE);
+    }
     if (strProfile.isNotEmpty())
+    {
         CHECK_ERROR2_RET(hrc, cloudNetwork, COMSETTER(Profile)(strProfile.raw()), RTEXITCODE_FAILURE);
+    }
 
     return RTEXITCODE_SUCCESS;

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -5828 +5828 @@
                     InsertConfigString(pLunL0, "Driver", "IntNet");
                     InsertConfigNode(pLunL0, "Config", &pCfg);
-                    InsertConfigString(pCfg, "Network", BstrFmt("cloud-%ls", bstr));
+                    InsertConfigString(pCfg, "Network", BstrFmt("cloud-%ls", bstr.raw()));
                     InsertConfigInteger(pCfg, "TrunkType", kIntNetTrunkType_WhateverNone);
                     InsertConfigString(pCfg, "IfPolicyPromisc", pszPromiscuousGuestPolicy);

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

@@ -7365 +7365 @@
     HRESULT hrc = E_FAIL;
     Bstr name;
-    ULONG iSlot = ULONG_MAX;
+    int iSlot = -1;
 
     LogFlowThisFunc(("Checking if cloud network needs to be connected\n"));
-    for (ULONG slot = 0; slot < mNetworkAdapters.size(); ++slot)
+    for (int slot = 0; slot < mNetworkAdapters.size(); ++slot)
     {
         BOOL enabled;
@@ -7424 +7424 @@
         {
             LogRel(("OCI-NET: Failed to obtain valid MAC address (%s) from cloud gateway '%ls'.\n",
-                    strMacAddress, name.raw()));
+                    strMacAddress.c_str(), name.raw()));
             return hrc;
         }
@@ -7434 +7434 @@
         if (SUCCEEDED(hrc))
         {
-            if (iSlot == ULONG_MAX)
+            if (iSlot == -1)
                 LogRel(("OCI-NET: No slot information available for cloud network attachment!\n"));
             else

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1696 +1696 @@
  */
 CloudNetwork::CloudNetwork() :
-    fEnabled(true),
     strProviderShortName("OCI"),
-    strProfileName("Default")
+    strProfileName("Default"),
+    fEnabled(true)
 {
 }