Changeset 28106 in vbox for trunk

Timestamp:

Apr 8, 2010 4:45:59 PM (15 years ago)

Author:

vboxsync

Message:

Main: Added machinery to query, set and use NIC boot priority.

Location:

trunk

Files:

• include/VBox/settings.h (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (3 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (3 diffs)
• src/VBox/Main/ConsoleImpl2.cpp (modified) (4 diffs)
• src/VBox/Main/NetworkAdapterImpl.cpp (modified) (3 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/NetworkAdapterImpl.h (modified) (2 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (3 diffs)

trunk/include/VBox/settings.h

@@ -407 +407 @@
           ulLineSpeed(0),
           fTraceEnabled(false),
-          mode(NetworkAttachmentType_Null)
+          mode(NetworkAttachmentType_Null),
+          ulBootPriority(0)
     {}
 
@@ -427 +428 @@
                                                 // with bridged: host interface or empty;
                                                 // otherwise: network name (required)
+    uint32_t                ulBootPriority;
 };
 typedef std::list<NetworkAdapter> NetworkAdaptersList;

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

@@ -206 +206 @@
                  "                            [--nictracefile<1-N> <filename>]\n"
                  "                            [--nicspeed<1-N> <kbps>]\n"
+                 "                            [--nicbootprio<1-N> <priority>]\n"
                  "                            [--bridgeadapter<1-N> none|<devicename>]\n"
 #if defined(VBOX_WITH_NETFLT)

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

@@ -856 +856 @@
                 nic->COMGETTER(LineSpeed)(&ulLineSpeed);
 
+                /* boot priority of the adapter */
+                ULONG ulBootPriority;
+                nic->COMGETTER(BootPriority)(&ulBootPriority);
+
                 if (details == VMINFO_MACHINEREADABLE)
                 {
@@ -863 +867 @@
                 }
                 else
-                    RTPrintf("NIC %d:           MAC: %lS, Attachment: %s, Cable connected: %s, Trace: %s (file: %lS), Type: %s, Reported speed: %d Mbps\n",
+                    RTPrintf("NIC %d:           MAC: %lS, Attachment: %s, Cable connected: %s, Trace: %s (file: %lS), Type: %s, Reported speed: %d Mbps, Boot priority: %d\n",
                              currentNIC + 1, strMACAddress.raw(), strAttachment.raw(),
                              fConnected ? "on" : "off",
@@ -869 +873 @@
                              traceFile.isEmpty() ? Bstr("none").raw() : traceFile.raw(),
                              strNICType.raw(),
-                             ulLineSpeed / 1000);
+                             ulLineSpeed / 1000,
+                             (int)ulBootPriority);
             }
         }

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

@@ -109 +109 @@
     MODIFYVM_NICTYPE,
     MODIFYVM_NICSPEED,
+    MODIFYVM_NICBOOTPRIO,
     MODIFYVM_NIC,
     MODIFYVM_CABLECONNECTED,
@@ -213 +214 @@
     { "--nictype",                  MODIFYVM_NICTYPE,                   RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--nicspeed",                 MODIFYVM_NICSPEED,                  RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_INDEX },
+    { "--nicbootprio",              MODIFYVM_NICBOOTPRIO,               RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_INDEX },
     { "--nic",                      MODIFYVM_NIC,                       RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--cableconnected",           MODIFYVM_CABLECONNECTED,            RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX },
@@ -1124 +1126 @@
             }
 
+            case MODIFYVM_NICBOOTPRIO:
+            {
+                ComPtr<INetworkAdapter> nic;
+    
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                /* Somewhat arbitrary limitation - we can pass a list of up to 4 PCI devices
+                 * to the PXE ROM, hence only boot priorities 1-4 are allowed (in addition to
+                 * 0 for the default lowest priority).
+                 */
+                if (ValueUnion.u32 > 4)
+                {
+                    errorArgument("Invalid boot priority '%u' specfied for NIC %u", ValueUnion.u32, GetOptState.uIndex);
+                    rc = E_FAIL;
+                }
+                else
+                {
+                    CHECK_ERROR(nic, COMSETTER(BootPriority)(ValueUnion.u32));
+                }
+                break;
+            }
+
             case MODIFYVM_NIC:
             {

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -192 +192 @@
 
 /*
+ * Simple class for storing network boot information.
+ */
+struct BootNic {
+    ULONG       mInstance;
+    unsigned    mPciDev;
+    unsigned    mPciFn;
+    ULONG       mBootPrio;
+    bool operator < (const BootNic &rhs) const
+    {
+        int lval = mBootPrio ? mBootPrio : INT_MAX;
+        int rval = rhs.mBootPrio ? rhs.mBootPrio : INT_MAX;
+        return lval < rval; /* Zero compares as highest number (lowest prio). */
+    }
+};
+
+/*
  * VC++ 8 / amd64 has some serious trouble with this function.
  * As a temporary measure, we'll drop global optimizations.
@@ -1450 +1466 @@
     rc = CFGMR3InsertNode(pDevices, "virtio-net", &pDevVirtioNet);                  RC_CHECK();
 #endif /* VBOX_WITH_VIRTIO */
+    std::list<BootNic> llNics;
     for (ULONG ulInstance = 0; ulInstance < SchemaDefs::NetworkAdapterCount; ++ulInstance)
     {
@@ -1529 +1546 @@
         }
 #endif
-        /*
-         * Transfer boot device information to the BIOS.
+        /* 
+         * Collect information needed for network booting and add it to the list.
          */
-        if (ulInstance == 0)
-        {
-            unsigned    uBootIdx = 0;
-
-            if (pNetBootCfg)    /* NetBoot node doesn't exist for EFI! */
-            {
-                PCFGMNODE   pNetBtDevCfg;
-                char        achBootIdx[] = "0";
-
-                achBootIdx[0] = '0' + uBootIdx;     /* Boot device order. */
-                rc = CFGMR3InsertNode(pNetBootCfg, achBootIdx, &pNetBtDevCfg);      RC_CHECK();
-                rc = CFGMR3InsertInteger(pNetBtDevCfg, "NIC", ulInstance);          RC_CHECK();
-                rc = CFGMR3InsertInteger(pNetBtDevCfg, "PCIDeviceNo", iPciDeviceNo);RC_CHECK();
-                rc = CFGMR3InsertInteger(pNetBtDevCfg, "PCIFunctionNo", 0);         RC_CHECK();
-            }
-        }
+        BootNic     nic;
+
+        nic.mInstance = ulInstance;
+        nic.mPciDev   = iPciDeviceNo;
+        nic.mPciFn    = 0;
+
+        hrc = networkAdapter->COMGETTER(BootPriority)(&nic.mBootPrio);              H();
+
+        llNics.push_back(nic);
 
         /*
@@ -1622 +1632 @@
         rc = configNetwork(pConsole, pszAdapterName, ulInstance, 0, networkAdapter,
                            pCfg, pLunL0, pInst, false /*fAttachDetach*/);           RC_CHECK();
+    }
+
+    /*
+     * 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;
+        char        achBootIdx[] = "0";
+        unsigned    uBootIdx = 0;
+
+        std::list<BootNic>::iterator it;
+
+        for (it = llNics.begin(); it != llNics.end(); ++it)
+        {
+            Assert(iter);
+
+            /* A NIC with priority 0 is only used if it's first in the list. */
+            if (it->mBootPrio == 0 && uBootIdx != 0)
+                break;
+
+            achBootIdx[0] = '0' + uBootIdx++;   /* Boot device order. */
+            rc = CFGMR3InsertNode(pNetBootCfg, achBootIdx, &pNetBtDevCfg);      RC_CHECK();
+            rc = CFGMR3InsertInteger(pNetBtDevCfg, "NIC", it->mInstance);       RC_CHECK();
+            rc = CFGMR3InsertInteger(pNetBtDevCfg, "PCIDeviceNo", it->mPciDev); RC_CHECK();
+            rc = CFGMR3InsertInteger(pNetBtDevCfg, "PCIFunctionNo", it->mPciFn);RC_CHECK();
+        }
     }
 

trunk/src/VBox/Main/NetworkAdapterImpl.cpp

@@ -803 +803 @@
 }
 
+STDMETHODIMP NetworkAdapter::COMGETTER(BootPriority) (ULONG *aBootPriority)
+{
+    CheckComArgOutPointerValid(aBootPriority);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aBootPriority = mData->mBootPriority;
+
+    return S_OK;
+}
+
+STDMETHODIMP NetworkAdapter::COMSETTER(BootPriority) (ULONG aBootPriority)
+{
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    /* the machine needs to be mutable */
+    AutoMutableStateDependency adep(mParent);
+    if (FAILED(adep.rc())) return adep.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (aBootPriority != mData->mBootPriority)
+    {
+        mData.backup();
+        mData->mBootPriority = aBootPriority;
+
+        m_fModified = true;
+        // leave the lock before informing callbacks
+        alock.release();
+
+        AutoWriteLock mlock(mParent COMMA_LOCKVAL_SRC_POS);       // mParent is const, no need to lock
+        mParent->setModified(Machine::IsModified_NetworkAdapters);
+        mlock.release();
+
+        /* No change in CFGM logic => changeAdapter=FALSE. */
+        mParent->onNetworkAdapterChange(this, FALSE);
+    }
+
+    return S_OK;
+}
+
 // INetworkAdapter methods
 ////////////////////////////////////////////////////////////////////////////////
@@ -1076 +1121 @@
     mData->mTraceEnabled = data.fTraceEnabled;
     mData->mTraceFile = data.strTraceFile;
+    /* boot priority (defaults to 0, i.e. lowest) */
+    mData->mBootPriority = data.ulBootPriority;
 
     switch (data.mode)
@@ -1146 +1193 @@
 
     data.strTraceFile = mData->mTraceFile;
+
+    data.ulBootPriority = mData->mBootPriority;
 
     data.type = mData->mAdapterType;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -11581 +11581 @@
   <interface
      name="INetworkAdapter" extends="$unknown"
-     uuid="65607a27-2b73-4d43-b4cc-0ba2c817fbde"
+     uuid="5bdb9df8-a5e1-4322-a139-b7a4a734c790"
      wsmap="managed"
      >
@@ -11680 +11680 @@
         for this interface. This is active only when the interface actually uses
         NAT (see <link to="#attachToNAT" />).
+      </desc>
+    </attribute>
+
+    <attribute name="bootPriority" type="unsigned long">
+      <desc>
+        Network boot priority of the adapter. Priority 1 is highest. If not set,
+        the priority is considered to be at the lowest possible setting.
       </desc>
     </attribute>

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

@@ -64 +64 @@
         Bstr mInternalNetwork;
         Bstr mNATNetwork;
+        ULONG mBootPriority;
     };
 
@@ -113 +114 @@
     STDMETHOD(COMSETTER(TraceFile)) (IN_BSTR aTraceFile);
     STDMETHOD(COMGETTER(NatDriver)) (INATEngine **aNatDriver);
+    STDMETHOD(COMGETTER(BootPriority)) (ULONG *aBootPriority);
+    STDMETHOD(COMSETTER(BootPriority)) (ULONG aBootPriority);
 
     // INetworkAdapter methods

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

@@ -1373 +1373 @@
                   && (mode              == n.mode)
                   && (strName           == n.strName)
+                  && (ulBootPriority    == n.ulBootPriority)
                 )
            );
@@ -1820 +1821 @@
         pelmAdapter->getAttributeValue("trace", nic.fTraceEnabled);
         pelmAdapter->getAttributeValue("tracefile", nic.strTraceFile);
+        pelmAdapter->getAttributeValue("bootPriority", nic.ulBootPriority);
 
         const xml::ElementNode *pelmAdapterChild;
@@ -3288 +3290 @@
         pelmAdapter->setAttribute("cable", nic.fCableConnected);
         pelmAdapter->setAttribute("speed", nic.ulLineSpeed);
+        if (nic.ulBootPriority != 0)
+        {
+            pelmAdapter->setAttribute("bootPriority", nic.ulBootPriority);
+        }
         if (nic.fTraceEnabled)
         {