Changeset 33910 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Nov 9, 2010 3:45:44 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

67566

Message:

Main, PXE: pass bus number too

File:

• trunk/src/VBox/Devices/PC/DevPcBios.cpp (modified) (3 diffs)

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

@@ -1099 +1099 @@
     {
         PCFGMNODE   pCfgNetBootDevice;
+        uint8_t     u8PciBus;
         uint8_t     u8PciDev;
         uint8_t     u8PciFn;
@@ -1109 +1110 @@
             szIndex[0] = '0' + i;
             pCfgNetBootDevice = CFGMR3GetChild(pCfgNetBoot, szIndex);
+
+            rc = CFGMR3QueryU8(pCfgNetBootDevice, "PCIBusNo", &u8PciBus);
+            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/PCIBusNo\" as integer failed"));
             rc = CFGMR3QueryU8(pCfgNetBootDevice, "PCIDeviceNo", &u8PciDev);
             if (rc == VERR_CFGM_VALUE_NOT_FOUND || rc == VERR_CFGM_NO_PARENT)
@@ -1129 +1141 @@
                 return PDMDEV_SET_ERROR(pDevIns, rc,
                                         N_("Configuration error: Querying \"Netboot/x/PCIFunctionNo\" as integer failed"));
+            /** @todo: encode bus number too */
             u16BusDevFn = ((u8PciDev & 0x1F) << 3) | (u8PciFn & 0x7);
             pThis->au16NetBootDev[i] = u16BusDevFn;