Changeset 28128 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 9, 2010 8:42:36 AM (15 years ago)

Author:

vboxsync

Message:

ConsoleImpl2.cpp: cosmetics.

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (8 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -47 +47 @@
 #endif
 #include <iprt/file.h>
-
-#include <limits.h>
 
 #include <VBox/vmapi.h>
@@ -193 +191 @@
 }
 
-/*
+/**
  * Simple class for storing network boot information.
  */
-struct BootNic {
+struct BootNic
+{
     ULONG       mInstance;
     unsigned    mPciDev;
@@ -203 +202 @@
     bool operator < (const BootNic &rhs) const
     {
-        int lval = mBootPrio ? mBootPrio : INT_MAX;
-        int rval = rhs.mBootPrio ? rhs.mBootPrio : INT_MAX;
+        ULONG lval = mBootPrio     - 1; /* 0 will wrap around and get the lowest priority. */
+        ULONG rval = rhs.mBootPrio - 1;
         return lval < rval; /* Zero compares as highest number (lowest prio). */
     }
@@ -1468 +1467 @@
     rc = CFGMR3InsertNode(pDevices, "virtio-net", &pDevVirtioNet);                  RC_CHECK();
 #endif /* VBOX_WITH_VIRTIO */
-    std::list<BootNic> llNics;
+    std::list<BootNic> llBootNics;
     for (ULONG ulInstance = 0; ulInstance < SchemaDefs::NetworkAdapterCount; ++ulInstance)
     {
@@ -1548 +1547 @@
         }
 #endif
-        /* 
+        /*
          * Collect information needed for network booting and add it to the list.
          */
@@ -1559 +1558 @@
         hrc = networkAdapter->COMGETTER(BootPriority)(&nic.mBootPrio);              H();
 
-        llNics.push_back(nic);
+        llBootNics.push_back(nic);
 
         /*
@@ -1639 +1638 @@
      * Build network boot information and transfer it to the BIOS.
      */
-    if (pNetBootCfg && !llNics.empty())  /* NetBoot node doesn't exist for EFI! */
-    {
-        llNics.sort();  /* Sort the list by boot priority. */
-
-        PCFGMNODE   pNetBtDevCfg;
+    if (pNetBootCfg && !llBootNics.empty())  /* NetBoot node doesn't exist for EFI! */
+    {
+        llBootNics.sort();  /* Sort the list by boot priority. */
+
         char        achBootIdx[] = "0";
         unsigned    uBootIdx = 0;
 
-        std::list<BootNic>::iterator it;
-
-        for (it = llNics.begin(); it != llNics.end(); ++it)
+        for (std::list<BootNic>::iterator it = llBootNics.begin(); it != llBootNics.end(); ++it)
         {
             /* A NIC with priority 0 is only used if it's first in the list. */
@@ -1655 +1651 @@
                 break;
 
+            PCFGMNODE pNetBtDevCfg;
             achBootIdx[0] = '0' + uBootIdx++;   /* Boot device order. */
             rc = CFGMR3InsertNode(pNetBootCfg, achBootIdx, &pNetBtDevCfg);      RC_CHECK();