Changeset 19007 in vbox for trunk/src/VBox

Timestamp:

Apr 18, 2009 8:07:59 AM (16 years ago)

Author:

vboxsync

Message:

Main: centralized control for extended device profiles, ACPI cleanup

Location:

trunk/src/VBox

Files:

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

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

@@ -141 +141 @@
     SYSTEM_INFO_INDEX_CPU3_STATUS       = 8,
     SYSTEM_INFO_INDEX_HIGH_MEMORY_LENGTH= 9,
-    SYSTEM_INFO_INDEX_END               = 10,
+    SYSTEM_INFO_INDEX_RTC_STATUS        = 10,
+    SYSTEM_INFO_INDEX_END               = 11,
     SYSTEM_INFO_INDEX_INVALID           = 0x80,
     SYSTEM_INFO_INDEX_VALID             = 0x200
@@ -214 +215 @@
     /** If ACPI CPU device should be shown */
     bool                fShowCpu;
+    /** If Real Time Clock ACPI object to be shown */
+    bool                fShowRtc;
     /** Aligning IBase. */
-    bool                afAlignment[6];
+    bool                afAlignment[5];
 
     /** ACPI port base interface. */
@@ -1317 +1320 @@
                             : 0;
                     break;
+               
                 case SYSTEM_INFO_INDEX_CPU0_STATUS:
-                    *pu32 = s->fShowCpu ? (  STA_DEVICE_PRESENT_MASK
-                                           | STA_DEVICE_ENABLED_MASK
-                                           | STA_DEVICE_SHOW_IN_UI_MASK
-                                           | STA_DEVICE_FUNCTIONING_PROPERLY_MASK)
-                            : 0;
-                    break;
-
                 case SYSTEM_INFO_INDEX_CPU1_STATUS:
                 case SYSTEM_INFO_INDEX_CPU2_STATUS:
@@ -1335 +1332 @@
                             | STA_DEVICE_FUNCTIONING_PROPERLY_MASK
                           : 0;
+                    break;
+
+                 case SYSTEM_INFO_INDEX_RTC_STATUS:
+                    *pu32 = s->fShowRtc ? (  STA_DEVICE_PRESENT_MASK
+                                           | STA_DEVICE_ENABLED_MASK
+                                           | STA_DEVICE_SHOW_IN_UI_MASK
+                                           | STA_DEVICE_FUNCTIONING_PROPERLY_MASK)
+                            : 0;
                     break;
 
@@ -1803 +1808 @@
                               "SmcEnabled\0"
                               "FdcEnabled\0"
+                              "ShowRtc\0"
+                              "ShowCpu\0"
                               ))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
@@ -1836 +1843 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to read \"SmcEnabled\""));
-    /** @todo: a bit of hack: if we have SMC, also show CPU object in ACPI tables */
-    s->fShowCpu = s->fUseSmc;
+
+    /* query whether we are supposed to present RTC object */
+    rc = CFGMR3QueryBoolDef(pCfgHandle, "ShowRtc", &s->fShowRtc, false);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to read \"ShowRtc\""));
+
+    /* query whether we are supposed to present CPU objects */
+    rc = CFGMR3QueryBoolDef(pCfgHandle, "ShowCpu", &s->fShowCpu, false);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to read \"ShowCpu\""));
 
     rc = CFGMR3QueryBool(pCfgHandle, "GCEnabled", &fGCEnabled);

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

@@ -184 +184 @@
             UCP3,  32,
             MEMH,  32,
+            URTC,  32,
             Offset (0x80),
             ININ, 32,
@@ -951 +952 @@
         Device(HPET) {
             Name(_HID,  EISAID("PNP0103"))
-// bird: Perhaps this is the cause for the RTC bitching below, but I've no patience to fine out.
-//            Name (_CID, 0x010CD041)
+            Name (_CID, 0x010CD041)
             Name(_UID, 0)
             Method (_STA, 0, NotSerialized) {
@@ -970 +970 @@
         }
 
-// bird: Doesn't work, breaks Vista and W7. Why is the length 8 and not 2? The examples
-//       I've got here uses 2 and also  includes IRQNoFlags () {8}
-//       Note: Do NOT even thing about re-enabling this without testing ALL windows versions.
-//
-//        Device (RTC) {
-//            Name (_HID, EisaId ("PNP0B00"))
-//            Name (_CRS, ResourceTemplate ()
-//            {
-//                IO (Decode16,
-//                    0x0070,             // Range Minimum
-//                    0x0070,             // Range Maximum
-//                    0x01,               // Alignment
-//                    0x08,               // Length
-//                    )
-//            })
-//        }
+        // Conditionally enabled, as lead to hang of Windows 7 and Vista guests 
+        Device (RTC) {
+            Name (_HID, EisaId ("PNP0B00"))
+            Name (_CRS, ResourceTemplate ()
+            {
+                IO (Decode16,
+                    0x0070,             // Range Minimum
+                    0x0070,             // Range Maximum
+                    0x01,               // Alignment
+                    0x08,               // Length
+                    )
+            })
+            Method (_STA, 0, NotSerialized)
+            {
+                Return (URTC)
+            }
+        }
 
        // System Management Controller

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -480 +480 @@
     rc = CFGMR3InsertInteger(pInst, "PCIBusNo",             1);/* ->pcibridge[0] */ RC_CHECK();
 #endif
+    
+    
+    Bstr tmpStr;
+    rc = pMachine->GetExtraData(Bstr("VBoxInternal/Devices/SupportExtHwProfile"), tmpStr.asOutParam());
+
+    BOOL fExtProfile;
+
+    if (SUCCEEDED(rc))
+        fExtProfile = (tmpStr == Bstr("on"));
+    else
+        fExtProfile = false;
 
     /*
@@ -485 +496 @@
      */
     BOOL fHpetEnabled;
-    /** @todo: implement appropriate getter */
 #ifdef VBOX_WITH_HPET
-    fHpetEnabled = true;
+    fHpetEnabled = fExtProfile;
 #else
     fHpetEnabled = false;
@@ -503 +513 @@
      */
     BOOL fSmcEnabled;
-    /** @todo: implement appropriate getter */
 #ifdef VBOX_WITH_SMC
-    fSmcEnabled = true;
+    fSmcEnabled = fExtProfile;
 #else
     fSmcEnabled = false;
@@ -522 +531 @@
     /** @todo: implement appropriate getter */
 #ifdef VBOX_WITH_LPC
-    fLpcEnabled = true;
+    fLpcEnabled = fExtProfile;
 #else
     fLpcEnabled = false;
@@ -658 +667 @@
         rc = CFGMR3InsertInteger(pCfg,  "SmcEnabled", fSmcEnabled);                 RC_CHECK();
 #endif
+        rc = CFGMR3InsertInteger(pCfg,  "ShowRtc", fExtProfile);                    RC_CHECK();      
+        rc = CFGMR3InsertInteger(pCfg,  "ShowCpu", fExtProfile);                    RC_CHECK();
         rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo",          7);                 RC_CHECK();
         Assert(!afPciDeviceNo[7]);