VirtualBox

Ticket #7214: virtualbox-beos-haiku-ostypes.diff

File virtualbox-beos-haiku-ostypes.diff, 5.7 KB (added by François REVOL, 14 years ago)

Diff against r35998

  • include/VBox/ostypes.h

     
    112112    VBOXOSTYPE_MacOS            = 0xB0000,
    113113    VBOXOSTYPE_MacOS_x64        = 0xB0100,
    114114    VBOXOSTYPE_JRockitVE        = 0xC0000,
     115    VBOXOSTYPE_BeOS             = 0xD0000,
     116    VBOXOSTYPE_Haiku            = 0xD1000,
    115117/** The bit number which indicates 64-bit or 32-bit. */
    116118#define VBOXOSTYPE_x64_BIT       8
    117119    /** The mask which indicates 64-bit. */
  • src/VBox/Main/xml/VirtualBox-settings-common.xsd

     
    204204    <xsd:enumeration value="MacOS"/>
    205205    <xsd:enumeration value="MacOS_64"/>
    206206    <xsd:enumeration value="JRockitVE"/>
     207    <xsd:enumeration value="BeOS"/>
     208    <xsd:enumeration value="Haiku"/>
    207209  </xsd:restriction>
    208210</xsd:simpleType>
    209211
  • src/VBox/Main/src-server/ApplianceImpl.cpp

     
    137137    //      SchemaDefs_OSTypeId_OpenBSD_64
    138138    //      SchemaDefs_OSTypeId_NetBSD
    139139    //      SchemaDefs_OSTypeId_NetBSD_64
     140    //      SchemaDefs_OSTypeId_BeOS
     141    //      SchemaDefs_OSTypeId_Haiku
    140142
    141143};
    142144
     
    175177    {"Windows Me",    SchemaDefs_OSTypeId_WindowsMe},
    176178    {"Windows 3.",    SchemaDefs_OSTypeId_Windows31},
    177179    {"DOS",           SchemaDefs_OSTypeId_DOS},
    178     {"OS2",           SchemaDefs_OSTypeId_OS2}
     180    {"OS2",           SchemaDefs_OSTypeId_OS2},
     181    {"BeOS",          SchemaDefs_OSTypeId_BeOS},
     182    {"Haiku",         SchemaDefs_OSTypeId_Haiku}
    179183};
    180184
    181185/* These are the 64-Bit ones. They are sorted by priority. */
  • src/VBox/Main/src-all/Global.cpp

     
    305305        VBOXOSTYPE_JRockitVE,     VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE,
    306306        1024, 4,  8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    307307        StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97  },
     308    { "Other",   "Other",             SchemaDefs_OSTypeId_BeOS,             "BeOS",
     309      VBOXOSTYPE_BeOS,             VBOXOSHINT_NONE,
     310       256,   4,  4 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
     311        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
     312    { "Other",   "Other",             SchemaDefs_OSTypeId_Haiku,             "Haiku",
     313      VBOXOSTYPE_Haiku,             VBOXOSHINT_NONE,
     314       256,   4,  4 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
     315        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
    308316};
    309317
    310318/**
  • src/VBox/Frontends/VirtualBox/VirtualBox2.qrc

     
    22 <qresource prefix="/">
    33    <file alias="os_archlinux.png">images/os_archlinux.png</file>
    44    <file alias="os_archlinux_64.png">images/os_archlinux_64.png</file>
     5    <file alias="os_beos.png">images/os_beos.png</file>
    56    <file alias="os_debian.png">images/os_debian.png</file>
    67    <file alias="os_debian_64.png">images/os_debian_64.png</file>
    78    <file alias="os_dos.png">images/os_dos.png</file>
     
    1112    <file alias="os_freebsd_64.png">images/os_freebsd_64.png</file>
    1213    <file alias="os_gentoo.png">images/os_gentoo.png</file>
    1314    <file alias="os_gentoo_64.png">images/os_gentoo_64.png</file>
     15    <file alias="os_haiku.png">images/os_haiku.png</file>
    1416    <file alias="os_jrockitve.png">images/os_jrockitve.png</file>
    1517    <file alias="os_l4.png">images/os_l4.png</file>
    1618    <file alias="os_linux_other.png">images/os_linux_other.png</file>
  • src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp

     
    127127    { QRegExp("Net", Qt::CaseInsensitive), "Netware" },
    128128    { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
    129129    { QRegExp("Ot", Qt::CaseInsensitive), "Other" },
     130    { QRegExp("BeOS", Qt::CaseInsensitive), "BeOS" },
     131    { QRegExp("Be.*R5", Qt::CaseInsensitive), "BeOS" },
     132    { QRegExp("Haiku", Qt::CaseInsensitive), "Haiku" },
     133    { QRegExp("Hai.*R1", Qt::CaseInsensitive), "Haiku" },
    130134};
    131135
    132136UINewVMWzd::UINewVMWzd(QWidget *pParent) : QIWizard(pParent)
  • src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

     
    49374937        {"MacOS",           ":/os_macosx.png"},
    49384938        {"MacOS_64",        ":/os_macosx_64.png"},
    49394939        {"JRockitVE",       ":/os_jrockitve.png"},
     4940        {"BeOS",            ":/os_beos.png"},
     4941        {"Haiku",           ":/os_haiku.png"},
    49404942    };
    49414943    for (uint n = 0; n < SIZEOF_ARRAY (kOSTypeIcons); ++ n)
    49424944    {

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy