Changeset 28487 in vbox

Timestamp:

Apr 19, 2010 5:59:26 PM (15 years ago)

Author:

vboxsync

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

60282

Message:

ACPI: another attempt to provide primary NIC info via ACPI

Location:

trunk/src/VBox

Files:

• Devices/PC/DevACPI.cpp (modified) (5 diffs)
• Devices/PC/vbox.dsl (modified) (2 diffs)
• Main/ConsoleImpl2.cpp (modified) (2 diffs)

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

@@ -163 +163 @@
     SYSTEM_INFO_INDEX_CPU_EVENT_TYPE    = 13, /**< Type of the CPU hot-plug event */
     SYSTEM_INFO_INDEX_CPU_EVENT         = 14, /**< The CPU id the event is for */
-    SYSTEM_INFO_INDEX_END               = 15,
+    SYSTEM_INFO_INDEX_NIC_ADDRESS       = 15, /**< NIC PCI address, or 0 */
+    SYSTEM_INFO_INDEX_END               = 16,
     SYSTEM_INFO_INDEX_INVALID           = 0x80,
     SYSTEM_INFO_INDEX_VALID             = 0x200
@@ -256 +257 @@
     /** Flag whether CPU hot plugging is enabled */
     bool                fCpuHotPlug;
-    /** Aligning IBase. */
-    bool                afAlignment[4];
+    /** Primary NIC PCI address */
+    uint32_t             u32NicPciAddress;
 
     /** ACPI port base interface. */
@@ -1504 +1505 @@
                     break;
 
+                case SYSTEM_INFO_INDEX_NIC_ADDRESS:
+                    *pu32 = s->u32NicPciAddress;
+                    break;
+
                 /* This is only for compatability with older saved states that
                    may include ACPI code that read these values.  Legacy is
@@ -2348 +2353 @@
                               "ShowRtc\0"
                               "ShowCpu\0"
+                              "NicPciAddress\0"
                               "CpuHotPlug\0"
                               "AmlFilePath\0"
@@ -2395 +2401 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to read \"ShowCpu\""));
+
+    /* query primary NIC PCI address */
+    rc = CFGMR3QueryU32Def(pCfg, "NicPciAddress", &s->u32NicPciAddress, 0);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to read \"NicPciAddress\""));
 
     /* query whether we are allow CPU hot plugging */

trunk/src/VBox/Devices/PC/vbox.dsl

@@ -148 +148 @@
             CPET,  32,
             CPEV,  32,
+            NICA,  32,
             Offset (0x80),
             ININ, 32,
@@ -760 +761 @@
                  }
              }
-
+            
+            // NIC
+            Device (GIGE)
+            {                
+                Method(_ADR, 0, NotSerialized)
+                {
+                    Return (NICA)
+                }
+
+                Name (_PRW, Package (0x02)
+                            {
+                               0x09,
+                               0x04
+                            })
+
+                Method (EWOL, 1, NotSerialized)
+                {
+                    Return (0x00)
+                }
+
+                Method (_STA, 0, NotSerialized)
+                {
+                    if (LEqual (NICA, Zero)) {
+                       Return (0x00)
+                    }
+                    else {
+                        Return (0x0F)
+                    }
+                }
+            }
+           
             // Control method battery
             Device (BAT0)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2247 +2247 @@
         rc = CFGMR3InsertInteger(pCfg,  "SmcEnabled", fSmcEnabled);                 RC_CHECK();
         rc = CFGMR3InsertInteger(pCfg,  "ShowRtc",    fExtProfile);                 RC_CHECK();
-
+        if (fExtProfile)
+        {
+            BootNic aNic = llBootNics.front();
+            uint32 u32NicPciAddr = (aNic.mPciDev << 16) | aNic.mPciFn;
+            rc = CFGMR3InsertInteger(pCfg,  "NicPciAddress",    u32NicPciAddr);     RC_CHECK();
+        }
         rc = CFGMR3InsertInteger(pCfg,  "ShowCpu", fShowCpu);                       RC_CHECK();
         rc = CFGMR3InsertInteger(pCfg,  "CpuHotPlug", fCpuHotPlug);                 RC_CHECK();
@@ -3768 +3773 @@
 #endif /* !VBOX_WITH_GUEST_CONTROL */
 }
-