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

Timestamp:

Feb 8, 2010 6:48:39 PM (15 years ago)

Author:

vboxsync

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

57420

Message:

Main, QT4/FE: OS X guest type support

Location:

trunk/src/VBox/Main

Files:

• 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) (2 diffs)
• xml/VirtualBox-settings-common.xsd (modified) (1 diff)

trunk/src/VBox/Main/Global.cpp

@@ -163 +163 @@
       VBOXOSTYPE_L4,              VBOXOSHINT_NONE,  64,   4,  2 * _1K, NetworkAdapterType_Am79C973, 0 },
     { "Other",   "Other",             SchemaDefs_OSTypeId_QNX,             "QNX",
-      VBOXOSTYPE_QNX,             VBOXOSHINT_HWVIRTEX,  512,   4,  4 * _1K, NetworkAdapterType_Am79C973, 0 }
+      VBOXOSTYPE_QNX,             VBOXOSHINT_HWVIRTEX,  512,   4,  4 * _1K, NetworkAdapterType_Am79C973, 0 },
+    { "MacOS",  "Mac OS X",             SchemaDefs_OSTypeId_MacOS,             "Mac OS X",
+      VBOXOSTYPE_MacOS,           VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_EXTHW,  1024,   4,  20 * _1K, NetworkAdapterType_I82543GC, 0 },
+    { "MacOS",  "Mac OS X",             SchemaDefs_OSTypeId_MacOS,             "Mac OS X (64 bit)",
+      VBOXOSTYPE_MacOS,           VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_EXTHW |  VBOXOSHINT_64BIT ,  1024,   4,  20 * _1K, NetworkAdapterType_I82543GC, 0 },
 };
 

trunk/src/VBox/Main/GuestOSTypeImpl.cpp

@@ -269 +269 @@
     return S_OK;
 }
+
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedExtHw) (BOOL *aRecommendedExtHw)
+{
+    CheckComArgOutPointerValid(aRecommendedExtHw);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    /* recommended h/w profile is constant during life time, no need to lock */
+    *aRecommendedExtHw = !!(mOSHint & VBOXOSHINT_EXTHW);
+
+    return S_OK;
+}
+
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedFirmware) (FirmwareType_T *aFirmwareType)
+{
+    CheckComArgOutPointerValid(aFirmwareType);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    /* firmware type is constant during life time, no need to lock */
+    *aFirmwareType = !!(mOSHint & VBOXOSHINT_EFI) ? FirmwareType_EFI : FirmwareType_BIOS;
+
+    return S_OK;
+}
+
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

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

@@ -8207 +8207 @@
   <interface
     name="IGuestOSType" extends="$unknown"
-    uuid="cfe9e64c-4430-435b-9e7c-e3d8e417bd58"
+    uuid="c64386de-8689-4fa2-927b-d65d95986b45"
     wsmap="struct"
   >
@@ -8256 +8256 @@
       <desc>Returns recommended network adapter for this OS type.</desc>
     </attribute>
+
+    <attribute name="recommendedExtHw" type="boolean" readonly="yes">
+      <desc>Returns @c true if extended hardware profile is recommended for this OS type.</desc>
+    </attribute>
+
+    <attribute name="recommendedFirmware" type="FirmwareType" readonly="yes">
+      <desc>Recommended firmware type.</desc>
+    </attribute>
+
   </interface>
 

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

@@ -39 +39 @@
 #define VBOXOSHINT_HWVIRTEX             RT_BIT(1)
 #define VBOXOSHINT_IOAPIC               RT_BIT(2)
+#define VBOXOSHINT_EFI                  RT_BIT(3)
+#define VBOXOSHINT_EXTHW                RT_BIT(4)
 
 /**

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

@@ -73 +73 @@
     STDMETHOD(COMGETTER(RecommendedHDD)) (ULONG *aHDDSize);
     STDMETHOD(COMGETTER(AdapterType)) (NetworkAdapterType_T *aNetworkAdapterType);
+    STDMETHOD(COMGETTER(RecommendedFirmware)) (FirmwareType_T *aFirmwareType);
+    STDMETHOD(COMGETTER(RecommendedExtHw)) (BOOL *aRecommendedExtHw);
 
     // public methods only for internal purposes
@@ -79 +81 @@
     bool recommendedIOAPIC() const { return !!(mOSHint & VBOXOSHINT_IOAPIC); }
     bool recommendedVirtEx() const { return !!(mOSHint & VBOXOSHINT_HWVIRTEX); }
+    bool recommendedExtHw() const { return !!(mOSHint & VBOXOSHINT_EXTHW); }
+    bool recommendedEFI() const { return !!(mOSHint & VBOXOSHINT_EFI); }
     NetworkAdapterType_T networkAdapterType() const { return mNetworkAdapterType; }
     uint32_t numSerialEnabled() const { return mNumSerialEnabled; }

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -205 +205 @@
     <xsd:enumeration value="OpenSolaris_64"/>
     <xsd:enumeration value="QNX"/>
+    <xsd:enumeration value="MacOS"/>
+    <xsd:enumeration value="MacOS_64"/>
   </xsd:restriction>
 </xsd:simpleType>