Changeset 49074 in vbox

Timestamp:

Oct 13, 2013 10:08:34 PM (11 years ago)

Author:

vboxsync

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

89879

Message:

Main, FE/Qt: Added a triple fault handling OS hint and a new OS/2 1.x guest type.

Location:

trunk

Files:

• include/VBox/ostypes.h (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/Global.h (modified) (1 diff)
• src/VBox/Main/include/GuestOSTypeImpl.h (modified) (1 diff)
• src/VBox/Main/src-all/Global.cpp (modified) (1 diff)
• src/VBox/Main/src-server/GuestOSTypeImpl.cpp (modified) (1 diff)

trunk/include/VBox/ostypes.h

@@ -75 +75 @@
     VBOXOSTYPE_OS2Warp45        = 0x43000,
     VBOXOSTYPE_ECS              = 0x44000,
+    VBOXOSTYPE_OS21x            = 0x48000,
     VBOXOSTYPE_Linux            = 0x50000,
     VBOXOSTYPE_Linux_x64        = 0x50100,

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -3972 +3972 @@
         {"OS2Warp45",       ":/os_os2warp45.png"},
         {"OS2eCS",          ":/os_os2ecs.png"},
+        {"OS21x",           ":/os_os2_other.png"},
         {"OS2",             ":/os_os2_other.png"},
         {"Linux22",         ":/os_linux22.png"},

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -157 +157 @@
     m_machine.SetCPUProperty(KCPUPropertyType_PAE, type.GetRecommendedPAE());
 
+    /* Set the recommended triple fault behavior: */
+    m_machine.SetCPUProperty(KCPUPropertyType_TripleFaultReset, type.GetRecommendedTFReset());
+
     /* Set recommended firmware type: */
     KFirmwareType fwType = type.GetRecommendedFirmware();

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

@@ -9323 +9323 @@
   <interface
     name="IGuestOSType" extends="$unknown"
-    uuid="6d968f9a-858b-4c50-bf17-241f069e94c2"
+    uuid="ced74f7e-4c08-4d19-883a-017496ada2e1"
     wsmap="struct"
     >
@@ -9435 +9435 @@
     <attribute name="recommendedUSB" type="boolean" readonly="yes">
       <desc>Returns @c true a USB controller is recommended for this OS type.</desc>
+    </attribute>
+
+    <attribute name="recommendedTFReset" type="boolean" readonly="yes">
+      <desc>Returns @c true if using VCPU reset on triple fault is recommended for this OS type.</desc>
     </attribute>
 

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

@@ -40 +40 @@
 #define VBOXOSHINT_FLOPPY               RT_BIT(11)
 #define VBOXOSHINT_NOUSB                RT_BIT(12)
+#define VBOXOSHINT_TFRESET              RT_BIT(13)
 
 /** The VBoxVRDP kludge extension pack name.

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

@@ -76 +76 @@
     STDMETHOD(COMGETTER(RecommendedFloppy))(BOOL *aRecommendedFloppy);
     STDMETHOD(COMGETTER(RecommendedUSB))(BOOL *aRecommendedUSB);
+    STDMETHOD(COMGETTER(RecommendedTFReset))(BOOL *aRecommendedTFReset);
 
     // public methods only for internal purposes

trunk/src/VBox/Main/src-all/Global.cpp

@@ -306 +306 @@
         256,  4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
+    { "OS2",     "IBM OS/2",          "OS21x",              "OS/2 1.x",
+      VBOXOSTYPE_OS21x,           VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB | VBOXOSHINT_TFRESET,
+        8, 4, 500 * _1M, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
     { "OS2",     "IBM OS/2",          "OS2",                "Other OS/2",
       VBOXOSTYPE_OS2,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,

trunk/src/VBox/Main/src-server/GuestOSTypeImpl.cpp

@@ -500 +500 @@
 }
 
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedTFReset)(BOOL *aRecommendedTFReset)
+{
+    CheckComArgOutPointerValid(aRecommendedTFReset);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    /* recommended triple fault behavior is constant during life time, no need to lock */
+    *aRecommendedTFReset = !!(mOSHint & VBOXOSHINT_TFRESET);
+
+    return S_OK;
+}
+
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */