Changeset 27851 in vbox for trunk/src

Timestamp:

Mar 31, 2010 8:22:22 AM (15 years ago)

Author:

vboxsync

Message:

Backed out acpi part of r59458; breaks Windows guests

Location:

trunk/src/VBox/Devices/PC

Files:

• DevACPI.cpp (modified) (5 diffs)
• vbox.dsl (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_NIC_STATUS        = 15, /**< If show NIC in ACPI */
-    SYSTEM_INFO_INDEX_END               = 16,
+    SYSTEM_INFO_INDEX_END               = 15,
     SYSTEM_INFO_INDEX_INVALID           = 0x80,
     SYSTEM_INFO_INDEX_VALID             = 0x200
@@ -257 +256 @@
     /** Flag whether CPU hot plugging is enabled */
     bool                fCpuHotPlug;
-    /** If NIC ACPI object to be shown */
-    bool                fShowNic;
     /** Aligning IBase. */
-    bool                afAlignment[3];
+    bool                afAlignment[4];
 
     /** ACPI port base interface. */
@@ -1507 +1504 @@
                     break;
 
-                case SYSTEM_INFO_INDEX_NIC_STATUS:
-                    *pu32 = s->fShowNic ? (  STA_DEVICE_PRESENT_MASK
-                                           | STA_DEVICE_ENABLED_MASK
-                                           | STA_DEVICE_SHOW_IN_UI_MASK
-                                           | STA_DEVICE_FUNCTIONING_PROPERLY_MASK)
-                                       : 0;
-                    break;
-
                 /* This is only for compatability with older saved states that
                    may include ACPI code that read these values.  Legacy is
@@ -2359 +2348 @@
                               "ShowRtc\0"
                               "ShowCpu\0"
-                              "ShowNic\0"
                               "CpuHotPlug\0"
                               "AmlFilePath\0"
@@ -2407 +2395 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to read \"ShowCpu\""));
-
-    /* query whether we are supposed to present NIC object */
-    rc = CFGMR3QueryBoolDef(pCfg, "ShowNic", &s->fShowNic, false);
-    if (RT_FAILURE(rc))
-        return PDMDEV_SET_ERROR(pDevIns, rc,
-                                N_("Configuration error: Failed to read \"ShowNic\""));
 
     /* query whether we are allow CPU hot plugging */

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

@@ -148 +148 @@
             CPET,  32,
             CPEV,  32,
-            UNIC,  32,
             Offset (0x80),
             ININ, 32,
@@ -761 +760 @@
                  }
              }
-            
-            // NIC
-            Device (GIGE)
-            {
-                /* 
-                 * Address is slot 0x3, function 0 - must be consistent with where NIC really is.
-                 * This code assumes E1K NIC of type != I82545EM, as latter goes to slot 0x11.
-                 * Device is important, as otherwise OSX refuses to accept NIC as internal,
-                 * which may lead to inability to use NIC for kernel debugging and high level
-                 * applications malfunctioning.
-                 */
-                Name (_ADR, 0x00030000)
-
-                Name (_PRW, Package (0x02)
-                            {
-                               0x09,
-                               0x03
-                            })
-
-                Method (EWOL, 1, NotSerialized)
-                {
-                    Return (0x00)
-                }
-                Method (_STA, 0, NotSerialized)
-                {
-                    Return (UNIC)
-                }
-            }
-           
+
             // Control method battery
             Device (BAT0)