VirtualBox

Changeset 39248 in vbox for trunk/src/VBox/Main/xml


Ignore:
Timestamp:
Nov 9, 2011 12:29:53 PM (13 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
74778
Message:

Runtime: new guest OS type for Solaris 11
Frontends/VirtualBox: add new patterns for Solaris 11 guest OS type, reuse the icon
Frontends/VBoxManage: more details for "list ostypes"
Main/xml: make guest OS type in config file an arbitrary string (still validated/mapped in the old way in the settings code), remove hardcoded limit of 8 network adapters
Main/Global: move list of valid guest OS types into a single place, add function to get the network adapter limit for each chipset type
Main/Console+Machine+Snapshot+NetworkAdapter+Appliance+VirtualBox+Guest+SystemProperties: consistently use the appropriate network adapter limit so that ICH9 chipset can use 36 network adapters, adapt to cleaned up guest OS type handling, remove leftover rendundant guest OS mapping, whitespace
Network/NAT: release log message cosmetics, allow unlimited number of instances, fix maxconn clamping
Network/PCNet+VirtioNet+E1000: allow unlimited number of instances

Location:
trunk/src/VBox/Main/xml
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Main/xml/SchemaDefs.xsl

    r29385 r39248  
    99 *  and should be reviewed on every Schema change.
    1010
    11      Copyright (C) 2006-2008 Oracle Corporation
     11     Copyright (C) 2006-2011 Oracle Corporation
    1212
    1313     This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    172172    "/>
    173173  </xsl:call-template>
    174   <xsl:call-template name="defineEnumMember">
    175     <xsl:with-param name="member" select="'        NetworkAdapterCount'"/>
    176     <xsl:with-param name="select" select="
    177       xsd:complexType[@name='TNetworkAdapter']/xsd:attribute[@name='slot']//xsd:maxExclusive/@value
    178     "/>
    179   </xsl:call-template>
    180174
    181175  <xsl:call-template name="defineEnumMember">
    … …  
    199193    "/>
    200194  </xsl:call-template>
    201 
    202 </xsl:template>
    203 
    204 <!--
    205  *  aliases (defines) for individual OSTypeIds array elements
    206 -->
    207 <xsl:template match="xsd:schema" mode="declare">
    208 
    209   <xsl:text>&#x0A;    extern const char *OSTypeIds[];&#x0A;</xsl:text>
    210 
    211   <xsl:text>&#x0A;    enum { OSTypeId_COUNT = </xsl:text>
    212   <xsl:value-of select="count (
    213     xsd:simpleType[@name='TGuestOSType']/xsd:restriction[@base='xsd:string']/xsd:enumeration |
    214     document(xsd:include[not(@schemaLocation='VirtualBox-settings-root.xsd')]/@schemaLocation)/xsd:schema/xsd:simpleType[@name='TGuestOSType']/xsd:restriction[@base='xsd:string']/xsd:enumeration
    215   )"/>
    216   <xsl:text> };&#x0A;&#x0A;</xsl:text>
    217 
    218   <xsl:for-each select="
    219     xsd:simpleType[@name='TGuestOSType']/xsd:restriction[@base='xsd:string']/xsd:enumeration |
    220     document(xsd:include[not(@schemaLocation='VirtualBox-settings-root.xsd')]/@schemaLocation)/xsd:schema/xsd:simpleType[@name='TGuestOSType']/xsd:restriction[@base='xsd:string']/xsd:enumeration
    221   ">
    222     <xsl:text>    #define SchemaDefs_OSTypeId_</xsl:text>
    223     <xsl:value-of select="@value"/>
    224     <xsl:text> SchemaDefs::OSTypeIds [</xsl:text>
    225     <xsl:value-of select="position()-1"/>
    226     <xsl:text>]&#x0A;</xsl:text>
    227   </xsl:for-each>
    228195
    229196</xsl:template>
    … …  
    257224
    258225<!--
    259  *  array of OSTypeIds
    260 -->
    261 <xsl:template match="xsd:schema" mode="define">
    262   <xsl:text>    const char *OSTypeIds[] =
    263     {
    264 </xsl:text>
    265   <xsl:for-each select="
    266     xsd:simpleType[@name='TGuestOSType']/xsd:restriction[@base='xsd:string']/xsd:enumeration |
    267     document(xsd:include[not(@schemaLocation='VirtualBox-settings-root.xsd')]/@schemaLocation)/xsd:schema/xsd:simpleType[@name='TGuestOSType']/xsd:restriction[@base='xsd:string']/xsd:enumeration
    268   ">
    269     <xsl:text>        "</xsl:text>
    270     <xsl:value-of select="@value"/>
    271     <xsl:text>",
    272 </xsl:text>
    273   </xsl:for-each>
    274   <xsl:text>    };
    275 </xsl:text>
    276 </xsl:template>
    277 
    278 <!--
    279226 * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    280227 *  END

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

    r38755 r39248  
    132132    <xsd:maxInclusive value="199999999-12-31T23:59:59Z"/>
    133133    <xsd:pattern value=".+-.+-.+T.+:.+:[0-9]{2}Z"/>
    134   </xsd:restriction>
    135 </xsd:simpleType>
    136 
    137 <xsd:simpleType name="TGuestOSType">
    138   <xsd:restriction base="xsd:string">
    139     <xsd:enumeration value="Other"/>
    140     <xsd:enumeration value="DOS"/>
    141     <xsd:enumeration value="Netware"/>
    142     <xsd:enumeration value="L4"/>
    143     <xsd:enumeration value="Windows31"/>
    144     <xsd:enumeration value="Windows95"/>
    145     <xsd:enumeration value="Windows98"/>
    146     <xsd:enumeration value="WindowsMe"/>
    147     <xsd:enumeration value="WindowsNT4"/>
    148     <xsd:enumeration value="Windows2000"/>
    149     <xsd:enumeration value="WindowsXP"/>
    150     <xsd:enumeration value="WindowsXP_64"/>
    151     <xsd:enumeration value="Windows2003"/>
    152     <xsd:enumeration value="Windows2003_64"/>
    153     <xsd:enumeration value="WindowsVista"/>
    154     <xsd:enumeration value="WindowsVista_64"/>
    155     <xsd:enumeration value="Windows2008"/>
    156     <xsd:enumeration value="Windows2008_64"/>
    157     <xsd:enumeration value="Windows7"/>
    158     <xsd:enumeration value="Windows7_64"/>
    159     <xsd:enumeration value="Windows8"/>
    160     <xsd:enumeration value="Windows8_64"/>
    161     <xsd:enumeration value="WindowsNT"/>
    162     <xsd:enumeration value="OS2Warp3"/>
    163     <xsd:enumeration value="OS2Warp4"/>
    164     <xsd:enumeration value="OS2Warp45"/>
    165     <xsd:enumeration value="OS2eCS"/>
    166     <xsd:enumeration value="OS2"/>
    167     <xsd:enumeration value="Linux22"/>
    168     <xsd:enumeration value="Linux24"/>
    169     <xsd:enumeration value="Linux24_64"/>
    170     <xsd:enumeration value="Linux26"/>
    171     <xsd:enumeration value="Linux26_64"/>
    172     <xsd:enumeration value="ArchLinux"/>
    173     <xsd:enumeration value="ArchLinux_64"/>
    174     <xsd:enumeration value="Debian"/>
    175     <xsd:enumeration value="Debian_64"/>
    176     <xsd:enumeration value="OpenSUSE"/>
    177     <xsd:enumeration value="OpenSUSE_64"/>
    178     <xsd:enumeration value="Fedora"/>
    179     <xsd:enumeration value="Fedora_64"/>
    180     <xsd:enumeration value="Gentoo"/>
    181     <xsd:enumeration value="Gentoo_64"/>
    182     <xsd:enumeration value="Mandriva"/>
    183     <xsd:enumeration value="Mandriva_64"/>
    184     <xsd:enumeration value="RedHat"/>
    185     <xsd:enumeration value="RedHat_64"/>
    186     <xsd:enumeration value="Turbolinux"/>
    187     <xsd:enumeration value="Turbolinux_64"/>
    188     <xsd:enumeration value="Ubuntu"/>
    189     <xsd:enumeration value="Ubuntu_64"/>
    190     <xsd:enumeration value="Xandros"/>
    191     <xsd:enumeration value="Xandros_64"/>
    192     <xsd:enumeration value="Oracle"/>
    193     <xsd:enumeration value="Oracle_64"/>
    194     <xsd:enumeration value="Linux"/>
    195     <xsd:enumeration value="FreeBSD"/>
    196     <xsd:enumeration value="FreeBSD_64"/>
    197     <xsd:enumeration value="OpenBSD"/>
    198     <xsd:enumeration value="OpenBSD_64"/>
    199     <xsd:enumeration value="NetBSD"/>
    200     <xsd:enumeration value="NetBSD_64"/>
    201     <xsd:enumeration value="Solaris"/>
    202     <xsd:enumeration value="Solaris_64"/>
    203     <xsd:enumeration value="OpenSolaris"/>
    204     <xsd:enumeration value="OpenSolaris_64"/>
    205     <xsd:enumeration value="QNX"/>
    206     <xsd:enumeration value="MacOS"/>
    207     <xsd:enumeration value="MacOS_64"/>
    208     <xsd:enumeration value="JRockitVE"/>
    209134  </xsd:restriction>
    210135</xsd:simpleType>
    … …  
    783708  </xsd:choice>
    784709  <xsd:attribute name="type" type="TNetworkAdapterType" default="Am79C970A"/>
    785   <xsd:attribute name="slot" use="required">
    786     <xsd:simpleType>
    787       <xsd:restriction base="xsd:unsignedInt">
    788         <xsd:minInclusive value="0"/>
    789         <xsd:maxExclusive value="8"/>
    790       </xsd:restriction>
    791     </xsd:simpleType>
    792   </xsd:attribute>
     710  <xsd:attribute name="slot" type="xsd:unsignedInt" use="required"/>
    793711  <xsd:attribute name="enabled" type="xsd:boolean" use="required"/>
    794712  <xsd:attribute name="MACAddress">
    … …  
    967885  <xsd:attribute name="name" type="TNonEmptyString" use="required"/>
    968886  <xsd:attribute name="nameSync" type="xsd:boolean" default="true"/>
    969   <xsd:attribute name="OSType" type="TGuestOSType" use="required"/>
     887  <xsd:attribute name="OSType" type="TNonEmptyString" use="required"/>
    970888  <xsd:attribute name="uuid" type="TNonNullUUID" use="required"/>
    971889  <xsd:attribute name="stateFile" type="TLocalFile"/>
Note: See TracChangeset for help on using the changeset viewer.

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