Changeset 26548 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 15, 2010 3:26:04 PM (15 years ago)

Author:

vboxsync

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

57726

Message:

Main, FE: HPET review feedback

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (3 diffs)
• Global.cpp (modified) (1 diff)
• GuestOSTypeImpl.cpp (modified) (1 diff)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/Global.h (modified) (1 diff)
• include/GuestOSTypeImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -586 +586 @@
     hrc = guestOSType->COMGETTER(FamilyId)(tmpStr2.asOutParam());                   H();
     /*
-     * Enable 3 following devices: HPET, SMC, LPC on MacOS X guests */
+     * Enable 3 following devices: HPET, SMC, LPC on MacOS X guests
+     */
     BOOL fExtProfile = tmpStr2 == Bstr("MacOS");
 
@@ -594 +595 @@
     BOOL fHpetEnabled;
 #ifdef VBOX_WITH_HPET
+    /* Other guests may wish to use HPET too, but MacOS X not functional without it */
     hrc = pMachine->COMGETTER(HpetEnabled)(&fHpetEnabled);                          H();
-    /* Always enable HPET in extended profile */
+    /* so always enable HPET in extended profile */
     fHpetEnabled |= fExtProfile;
 #else
@@ -2092 +2094 @@
         rc = CFGMR3InsertInteger(pCfg,  "IOAPIC", fIOAPIC);                         RC_CHECK();
         rc = CFGMR3InsertInteger(pCfg,  "FdcEnabled", fFdcEnabled);                 RC_CHECK();
-#ifdef VBOX_WITH_HPET
         rc = CFGMR3InsertInteger(pCfg,  "HpetEnabled", fHpetEnabled);               RC_CHECK();
-#endif
 #ifdef VBOX_WITH_SMC
         rc = CFGMR3InsertInteger(pCfg,  "SmcEnabled", fSmcEnabled);                 RC_CHECK();

trunk/src/VBox/Main/Global.cpp

@@ -157 +157 @@
       VBOXOSTYPE_OS2,             VBOXOSHINT_HWVIRTEX,   96,   4,  2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4 },
     { "MacOS",  "Mac OS X",             SchemaDefs_OSTypeId_MacOS,             "Mac OS X",
-      VBOXOSTYPE_MacOS,           VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID,  1024,   4,  20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6 },
+      VBOXOSTYPE_MacOS,           VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET,  1024,   4,  20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6 },
     { "MacOS",  "Mac OS X",             SchemaDefs_OSTypeId_MacOS_64,          "Mac OS X (64 bit)",
-      VBOXOSTYPE_MacOS_x64,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE |  VBOXOSHINT_64BIT | VBOXOSHINT_USBHID,  1024,   4,  20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6 },
+      VBOXOSTYPE_MacOS_x64,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE |  VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET,  1024,   4,  20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6 },
     { "Other",   "Other",             SchemaDefs_OSTypeId_DOS,             "DOS",
       VBOXOSTYPE_DOS,             VBOXOSHINT_NONE,  32,   4,      512, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 },

trunk/src/VBox/Main/GuestOSTypeImpl.cpp

@@ -332 +332 @@
 }
 
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedHpet) (BOOL *aRecommendedHpet)
+{
+    CheckComArgOutPointerValid(aRecommendedHpet);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    /* HPET recomendation is constant during life time, no need to lock */
+    *aRecommendedHpet = !!(mOSHint & VBOXOSHINT_HPET);
+
+    return S_OK;
+}
+
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -8275 +8275 @@
   <interface
     name="IGuestOSType" extends="$unknown"
-    uuid="1498bf9c-c662-4cee-8f6f-59ec933fa892"
+    uuid="5e02d197-dfa2-474d-bd1d-3243a1f24afb"
     wsmap="struct"
   >
@@ -8339 +8339 @@
     <attribute name="recommendedUsbHid" type="boolean" readonly="yes">
       <desc>Returns @c true if using USB Human Interface Devices, such as keyboard and mouse recommended.</desc>
+    </attribute>
+
+     <attribute name="recommendedHpet" type="boolean" readonly="yes">
+      <desc>Returns @c true if using HPET is recommended for this OS type.</desc>
     </attribute>
 

trunk/src/VBox/Main/include/Global.h

@@ -42 +42 @@
 #define VBOXOSHINT_PAE                  RT_BIT(4)
 #define VBOXOSHINT_USBHID               RT_BIT(5)
-
+#define VBOXOSHINT_HPET                 RT_BIT(6)
 
 /**

trunk/src/VBox/Main/include/GuestOSTypeImpl.h

@@ -78 +78 @@
     STDMETHOD(COMGETTER(RecommendedPae)) (BOOL *aRecommendedExtHw);
     STDMETHOD(COMGETTER(RecommendedUsbHid)) (BOOL *aRecommendedUsbHid);
+    STDMETHOD(COMGETTER(RecommendedHpet)) (BOOL *aRecommendedHpet);
 
     // public methods only for internal purposes