Changeset 27692 in vbox for trunk/src/VBox

Timestamp:

Mar 25, 2010 10:32:25 AM (15 years ago)

Author:

vboxsync

Message:

Pass boot NIC PCI dev/fn separately to DevPcBios. Easier to understand and modify.

Location:

trunk/src/VBox

Files:

• Devices/PC/DevPcBios.cpp (modified) (3 diffs)
• Main/ConsoleImpl2.cpp (modified) (1 diff)

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -1083 +1083 @@
     {
         PCFGMNODE   pCfgNetBootDevice;
+        uint8_t     u8PciDev;
+        uint8_t     u8PciFn;
         uint16_t    u16BusDevFn;
         char        szIndex[] = "?";
@@ -1091 +1093 @@
             szIndex[0] = '0' + i;
             pCfgNetBootDevice = CFGMR3GetChild(pCfgNetBoot, szIndex);
-            rc = CFGMR3QueryU16(pCfgNetBootDevice, "BusDevFn", &u16BusDevFn);
+            rc = CFGMR3QueryU8(pCfgNetBootDevice, "PCIDeviceNo", &u8PciDev);
             if (rc == VERR_CFGM_VALUE_NOT_FOUND || rc == VERR_CFGM_NO_PARENT)
             {
@@ -1100 +1102 @@
             else if (RT_FAILURE(rc))
                 return PDMDEV_SET_ERROR(pDevIns, rc,
-                                        N_("Configuration error: Querying \"Netboot/x/BusDevFn\" as integer failed"));
+                                        N_("Configuration error: Querying \"Netboot/x/PCIDeviceNo\" as integer failed"));
+            rc = CFGMR3QueryU8(pCfgNetBootDevice, "PCIFunctionNo", &u8PciFn);
+            if (rc == VERR_CFGM_VALUE_NOT_FOUND || rc == VERR_CFGM_NO_PARENT)
+            {
+                /* Do nothing and stop iterating. */
+                rc = VINF_SUCCESS;
+                break;
+            }
+            else if (RT_FAILURE(rc))
+                return PDMDEV_SET_ERROR(pDevIns, rc,
+                                        N_("Configuration error: Querying \"Netboot/x/PCIFunctionNo\" as integer failed"));
+            u16BusDevFn = ((u8PciDev & 0x1F) << 3) | (u8PciFn & 0x7);
             pThis->au16NetBootDev[i] = u16BusDevFn;
         }

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1541 +1541 @@
                 PCFGMNODE   pNetBtDevCfg;
                 char        achBootIdx[] = "0";
-                uint16_t    u16BusDevFn;
 
                 achBootIdx[0] = '0' + uBootIdx;     /* Boot device order. */
                 rc = CFGMR3InsertNode(pNetBootCfg, achBootIdx, &pNetBtDevCfg);      RC_CHECK();
                 rc = CFGMR3InsertInteger(pNetBtDevCfg, "NIC", ulInstance);          RC_CHECK();
-                u16BusDevFn = iPciDeviceNo << 3;
-                rc = CFGMR3InsertInteger(pNetBtDevCfg, "BusDevFn", u16BusDevFn);    RC_CHECK();
+                rc = CFGMR3InsertInteger(pNetBtDevCfg, "PCIDeviceNo", iPciDeviceNo);RC_CHECK();
+                rc = CFGMR3InsertInteger(pNetBtDevCfg, "PCIFunctionNo", 0);         RC_CHECK();
             }
         }