Changeset 82132 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Nov 23, 2019 8:30:28 PM (5 years ago)

Author:

vboxsync

Message:

ConsoleImpl2.cpp: nits.

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (7 diffs)

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

@@ -2462 +2462 @@
 #endif /* VBOX_WITH_VIRTIO */
         std::list<BootNic> llBootNics;
-        for (ULONG ulInstance = 0; ulInstance < maxNetworkAdapters; ++ulInstance)
+        for (ULONG uInstance = 0; uInstance < maxNetworkAdapters; ++uInstance)
         {
             ComPtr<INetworkAdapter> networkAdapter;
-            hrc = pMachine->GetNetworkAdapter(ulInstance, networkAdapter.asOutParam());     H();
+            hrc = pMachine->GetNetworkAdapter(uInstance, networkAdapter.asOutParam());      H();
             BOOL fEnabledNetAdapter = FALSE;
             hrc = networkAdapter->COMGETTER(Enabled)(&fEnabledNetAdapter);                  H();
@@ -2499 +2499 @@
 #endif /* VBOX_WITH_VIRTIO */
                 default:
-                    AssertMsgFailed(("Invalid network adapter type '%d' for slot '%d'",
-                                    adapterType, ulInstance));
+                    AssertMsgFailed(("Invalid network adapter type '%d' for slot '%d'", adapterType, uInstance));
                     return VMR3SetError(pUVM, VERR_INVALID_PARAMETER, RT_SRC_POS,
-                                        N_("Invalid network adapter type '%d' for slot '%d'"),
-                                        adapterType, ulInstance);
-            }
-
-            InsertConfigNode(pDev, Utf8StrFmt("%u", ulInstance).c_str(), &pInst);
+                                        N_("Invalid network adapter type '%d' for slot '%d'"), adapterType, uInstance);
+            }
+
+            InsertConfigNode(pDev, Utf8StrFmt("%u", uInstance).c_str(), &pInst);
             InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
             /* the first network card gets the PCI ID 3, the next 3 gets 8..10,
              * next 4 get 16..19. */
             int iPCIDeviceNo;
-            switch (ulInstance)
+            switch (uInstance)
             {
                 case 0:
@@ -2517 +2515 @@
                     break;
                 case 1: case 2: case 3:
-                    iPCIDeviceNo = ulInstance - 1 + 8;
+                    iPCIDeviceNo = uInstance - 1 + 8;
                     break;
                 case 4: case 5: case 6: case 7:
-                    iPCIDeviceNo = ulInstance - 4 + 16;
+                    iPCIDeviceNo = uInstance - 4 + 16;
                     break;
                 default:
@@ -2546 +2544 @@
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE   /* not safe here yet. */ /** @todo Make PCNet ring-0 safe on 32-bit mac kernels! */
             if (pDev == pDevPCNet)
-            {
                 InsertConfigInteger(pCfg, "R0Enabled",    false);
-            }
 #endif
             /*
@@ -2555 +2551 @@
             BootNic     nic;
 
-            nic.mInstance    = ulInstance;
+            nic.mInstance    = uInstance;
             /* Could be updated by reference, if auto assigned */
             nic.mPCIAddress  = PCIAddr;
@@ -2636 +2632 @@
              * Attach the status driver.
              */
-            i_attachStatusDriver(pInst, &mapNetworkLeds[ulInstance], 0, 0, NULL, NULL, 0);
+            i_attachStatusDriver(pInst, &mapNetworkLeds[uInstance], 0, 0, NULL, NULL, 0);
 
             /*
@@ -2643 +2639 @@
             bool fIgnoreConnectFailure = mMachineState == MachineState_Restoring;
             rc = i_configNetwork(pszAdapterName,
-                                 ulInstance,
+                                 uInstance,
                                  0,
                                  networkAdapter,