VirtualBox

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


Ignore:
Timestamp:
Mar 13, 2008 2:33:18 PM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
28880
Message:

Main: Applied SATA changes from #2406. Increased XML settings version format from 1.2 to 1.3.pre.

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

Legend:

Unmodified
Added
Removed

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

    r6597 r7442  
    9292  <!-- process include statements -->
    9393  <xsl:for-each select="xsd:include">
    94     <xsl:apply-templates select="document(@schemaLocation)/xsd:schema"/>
     94    <!-- skip VirtualBox-settings-root.xsd inclusion as it is computed at runtime -->
     95    <xsl:if test="not(@schemaLocation='VirtualBox-settings-root.xsd')">
     96      <xsl:apply-templates select="document(@schemaLocation)/xsd:schema"/>
     97    </xsl:if>
    9598  </xsl:for-each>
    9699
    97100  <xsl:call-template name="defineEnumMember">
    98       <xsl:with-param name="member" select="'        MinGuestRAM'"/>
    99       <xsl:with-param name="select" select="
    100         xsd:complexType[@name='TMemory']/xsd:attribute[@name='RAMSize']//xsd:minInclusive/@value
    101       "/>
     101    <xsl:with-param name="member" select="'        MinGuestRAM'"/>
     102    <xsl:with-param name="select" select="
     103      xsd:complexType[@name='TMemory']/xsd:attribute[@name='RAMSize']//xsd:minInclusive/@value
     104    "/>
    102105  </xsl:call-template>
    103106  <xsl:call-template name="defineEnumMember">
    104       <xsl:with-param name="member" select="'        MaxGuestRAM'"/>
    105       <xsl:with-param name="select" select="
    106         xsd:complexType[@name='TMemory']/xsd:attribute[@name='RAMSize']//xsd:maxInclusive/@value
    107       "/>
     107    <xsl:with-param name="member" select="'        MaxGuestRAM'"/>
     108    <xsl:with-param name="select" select="
     109      xsd:complexType[@name='TMemory']/xsd:attribute[@name='RAMSize']//xsd:maxInclusive/@value
     110    "/>
    108111  </xsl:call-template>
    109112
    110113  <xsl:call-template name="defineEnumMember">
    111       <xsl:with-param name="member" select="'        MinGuestVRAM'"/>
    112       <xsl:with-param name="select" select="
    113         xsd:complexType[@name='TDisplay']/xsd:attribute[@name='VRAMSize']//xsd:minInclusive/@value
    114       "/>
     114    <xsl:with-param name="member" select="'        MinGuestVRAM'"/>
     115    <xsl:with-param name="select" select="
     116      xsd:complexType[@name='TDisplay']/xsd:attribute[@name='VRAMSize']//xsd:minInclusive/@value
     117    "/>
    115118  </xsl:call-template>
    116119  <xsl:call-template name="defineEnumMember">
    117       <xsl:with-param name="member" select="'        MaxGuestVRAM'"/>
    118       <xsl:with-param name="select" select="
    119         xsd:complexType[@name='TDisplay']/xsd:attribute[@name='VRAMSize']//xsd:maxInclusive/@value
    120       "/>
     120    <xsl:with-param name="member" select="'        MaxGuestVRAM'"/>
     121    <xsl:with-param name="select" select="
     122      xsd:complexType[@name='TDisplay']/xsd:attribute[@name='VRAMSize']//xsd:maxInclusive/@value
     123    "/>
    121124  </xsl:call-template>
    122125  <xsl:call-template name="defineEnumMember">
    123       <xsl:with-param name="member" select="'        MaxGuestMonitors'"/>
    124       <xsl:with-param name="select" select="
    125         xsd:complexType[@name='TDisplay']/xsd:attribute[@name='MonitorCount']//xsd:maxInclusive/@value
    126       "/>
     126    <xsl:with-param name="member" select="'        MaxGuestMonitors'"/>
     127    <xsl:with-param name="select" select="
     128      xsd:complexType[@name='TDisplay']/xsd:attribute[@name='MonitorCount']//xsd:maxInclusive/@value
     129    "/>
    127130  </xsl:call-template>
    128131  <xsl:call-template name="defineEnumMember">
    129       <xsl:with-param name="member" select="'        NetworkAdapterCount'"/>
    130       <xsl:with-param name="select" select="
    131         xsd:complexType[@name='TNetworkAdapter']/xsd:attribute[@name='slot']//xsd:maxExclusive/@value
    132       "/>
     132    <xsl:with-param name="member" select="'        NetworkAdapterCount'"/>
     133    <xsl:with-param name="select" select="
     134      xsd:complexType[@name='TNetworkAdapter']/xsd:attribute[@name='slot']//xsd:maxExclusive/@value
     135    "/>
    133136  </xsl:call-template>
    134137  <xsl:call-template name="defineEnumMember">
    135       <xsl:with-param name="member" select="'        SerialPortCount'"/>
    136       <xsl:with-param name="select" select="
    137         xsd:complexType[@name='TUartPort']/xsd:attribute[@name='slot']//xsd:maxExclusive/@value
    138       "/>
     138    <xsl:with-param name="member" select="'        SerialPortCount'"/>
     139    <xsl:with-param name="select" select="
     140      xsd:complexType[@name='TUartPort']/xsd:attribute[@name='slot']//xsd:maxExclusive/@value
     141    "/>
    139142  </xsl:call-template>
    140143  <xsl:call-template name="defineEnumMember">
    141       <xsl:with-param name="member" select="'        ParallelPortCount'"/>
    142       <xsl:with-param name="select" select="
    143         xsd:complexType[@name='TLptPort']/xsd:attribute[@name='slot']//xsd:maxExclusive/@value
    144       "/>
     144    <xsl:with-param name="member" select="'        ParallelPortCount'"/>
     145    <xsl:with-param name="select" select="
     146      xsd:complexType[@name='TLptPort']/xsd:attribute[@name='slot']//xsd:maxExclusive/@value
     147    "/>
    145148  </xsl:call-template>
    146149  <xsl:call-template name="defineEnumMember">
    147       <xsl:with-param name="member" select="'        MaxBootPosition'"/>
    148       <xsl:with-param name="select" select="
    149         xsd:complexType[@name='TBoot']//xsd:element[@name='Order']//xsd:attribute[@name='position']//xsd:maxInclusive/@value
    150       "/>
     150    <xsl:with-param name="member" select="'        MaxBootPosition'"/>
     151    <xsl:with-param name="select" select="
     152      xsd:complexType[@name='TBoot']//xsd:element[@name='Order']//xsd:attribute[@name='position']//xsd:maxInclusive/@value
     153    "/>
    151154  </xsl:call-template>
    152155

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

    r7218 r7442  
    498498    <xsd:simpleType>
    499499      <xsd:restriction base="xsd:token">
    500         <xsd:enumeration value="ide0"/>
    501         <xsd:enumeration value="ide1"/>
    502       </xsd:restriction>
    503     </xsd:simpleType>
    504   </xsd:attribute>
    505   <xsd:attribute name="device" use="required">
    506     <xsd:simpleType>
    507       <xsd:restriction base="xsd:token">
    508         <xsd:enumeration value="master"/>
    509         <xsd:enumeration value="slave"/>
    510       </xsd:restriction>
    511     </xsd:simpleType>
    512   </xsd:attribute>
     500        <xsd:enumeration value="IDE"/>
     501        <xsd:enumeration value="SATA"/>
     502      </xsd:restriction>
     503    </xsd:simpleType>
     504  </xsd:attribute>
     505  <xsd:attribute name="channel" type="xsd:unsignedInt" use="required"/>
     506  <xsd:attribute name="device" type="xsd:unsignedInt" default="0"/>
    513507</xsd:complexType>
    514508
    … …  
    658652  <xsd:attribute name="MemoryBalloonSize"        type="xsd:unsignedInt" default="0"/>
    659653  <xsd:attribute name="StatisticsUpdateInterval" type="xsd:unsignedInt" default="0"/>
     654</xsd:complexType>
     655
     656<xsd:complexType name="TSATAController">
     657  <xsd:attribute name="enabled" type="xsd:boolean" use="required"/>
     658  <xsd:attribute name="IDE0MasterEmulationPort" type="xsd:unsignedInt" default="0"/>
     659  <xsd:attribute name="IDE0SlaveEmulationPort" type="xsd:unsignedInt" default="1"/>
     660  <xsd:attribute name="IDE1MasterEmulationPort" type="xsd:unsignedInt" default="2"/>
     661  <xsd:attribute name="IDE1SlaveEmulationPort" type="xsd:unsignedInt" default="3"/>
    660662</xsd:complexType>
    661663
    … …  
    676678    <xsd:element name="FloppyDrive" type="TFloppyDrive"/>
    677679    <xsd:element name="USBController" type="TUSBController"/>
     680    <xsd:element name="SATAController" type="TSATAController"/>
    678681    <xsd:element name="Network" type="TNetwork">
    679682      <xsd:unique name="THardware-Network-Adapter">

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

    r6606 r7442  
    2727<xsd:annotation>
    2828  <xsd:documentation xml:lang="en">
    29     innotek VirtualBox Settings Schema Version 1.0-freebsd.
    30     Copyright (c) 2004-2007 innotek GmbH.
     29    innotek VirtualBox Settings Schema (freebsd).
     30    Copyright (c) 2004-2008 innotek GmbH.
    3131  </xsd:documentation>
    3232</xsd:annotation>
    3333
    3434<xsd:include schemaLocation="VirtualBox-settings-common.xsd"/>
     35
     36<!--
     37  this includes a computed VirtualBox element definition that contains
     38  a proper 'version' attribute constraint (e.g. recent verison number
     39  and platform suffix)
     40-->
     41<xsd:include schemaLocation="VirtualBox-settings-root.xsd"/>
    3542
    3643<!--
    … …  
    102109</xsd:complexType>
    103110
    104 <!--
    105 // Root element
    106 /////////////////////////////////////////////////////////////////////////
    107 -->
    108 
    109 <xsd:element name="VirtualBox">
    110   <xsd:complexType>
    111     <xsd:complexContent>
    112       <xsd:extension base="TVirtualBox">
    113         <xsd:attribute name="version" type="xsd:token" fixed="1.2-freebsd" use="required"/>
    114       </xsd:extension>
    115     </xsd:complexContent>
    116   </xsd:complexType>
    117 </xsd:element>
    118 
    119111</xsd:schema>

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

    r6597 r7442  
    2727<xsd:annotation>
    2828  <xsd:documentation xml:lang="en">
    29     innotek VirtualBox Settings Schema Version 1.0-linux.
    30     Copyright (c) 2004-2007 innotek GmbH.
     29    innotek VirtualBox Settings Schema (linux).
     30    Copyright (c) 2004-2008 innotek GmbH.
    3131  </xsd:documentation>
    3232</xsd:annotation>
    3333
    3434<xsd:include schemaLocation="VirtualBox-settings-common.xsd"/>
     35
     36<!--
     37  this includes a computed VirtualBox element definition that contains
     38  a proper 'version' attribute constraint (e.g. recent verison number
     39  and platform suffix)
     40-->
     41<xsd:include schemaLocation="VirtualBox-settings-root.xsd"/>
    3542
    3643<!--
    … …  
    103110</xsd:complexType>
    104111
    105 <!--
    106 // Root element
    107 /////////////////////////////////////////////////////////////////////////
    108 -->
    109 
    110 <xsd:element name="VirtualBox">
    111   <xsd:complexType>
    112     <xsd:complexContent>
    113       <xsd:extension base="TVirtualBox">
    114         <xsd:attribute name="version" type="xsd:token" fixed="1.2-linux" use="required"/>
    115       </xsd:extension>
    116     </xsd:complexContent>
    117   </xsd:complexType>
    118 </xsd:element>
    119 
    120112</xsd:schema>

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

    r6606 r7442  
    2727<xsd:annotation>
    2828  <xsd:documentation xml:lang="en">
    29     innotek VirtualBox Settings Schema Version 1.0-macosx.
    30     Copyright (c) 2004-2007 innotek GmbH.
     29    innotek VirtualBox Settings Schema (macosx).
     30    Copyright (c) 2004-2008 innotek GmbH.
    3131  </xsd:documentation>
    3232</xsd:annotation>
    3333
    3434<xsd:include schemaLocation="VirtualBox-settings-common.xsd"/>
     35
     36<!--
     37  this includes a computed VirtualBox element definition that contains
     38  a proper 'version' attribute constraint (e.g. recent verison number
     39  and platform suffix)
     40-->
     41<xsd:include schemaLocation="VirtualBox-settings-root.xsd"/>
    3542
    3643<!--
    … …  
    101108</xsd:complexType>
    102109
    103 <!--
    104 // Root element
    105 /////////////////////////////////////////////////////////////////////////
    106 -->
    107 
    108 <xsd:element name="VirtualBox">
    109   <xsd:complexType>
    110     <xsd:complexContent>
    111       <xsd:extension base="TVirtualBox">
    112         <xsd:attribute name="version" type="xsd:token" fixed="1.2-macosx" use="required"/>
    113       </xsd:extension>
    114     </xsd:complexContent>
    115   </xsd:complexType>
    116 </xsd:element>
    117 
    118110</xsd:schema>

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

    r6606 r7442  
    2727<xsd:annotation>
    2828  <xsd:documentation xml:lang="en">
    29     innotek VirtualBox Settings Schema Version 1.0-os2.
    30     Copyright (c) 2004-2007 innotek GmbH.
     29    innotek VirtualBox Settings Schema (os2).
     30    Copyright (c) 2004-2008 innotek GmbH.
    3131  </xsd:documentation>
    3232</xsd:annotation>
    3333
    3434<xsd:include schemaLocation="VirtualBox-settings-common.xsd"/>
     35
     36<!--
     37  this includes a computed VirtualBox element definition that contains
     38  a proper 'version' attribute constraint (e.g. recent verison number
     39  and platform suffix)
     40-->
     41<xsd:include schemaLocation="VirtualBox-settings-root.xsd"/>
    3542
    3643<!--
    … …  
    101108</xsd:complexType>
    102109
    103 <!--
    104 // Root element
    105 /////////////////////////////////////////////////////////////////////////
    106 -->
    107 
    108 <xsd:element name="VirtualBox">
    109   <xsd:complexType>
    110     <xsd:complexContent>
    111       <xsd:extension base="TVirtualBox">
    112         <xsd:attribute name="version" type="xsd:token" fixed="1.2-os2" use="required"/>
    113       </xsd:extension>
    114     </xsd:complexContent>
    115   </xsd:complexType>
    116 </xsd:element>
    117 
    118110</xsd:schema>

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

    r6606 r7442  
    2727<xsd:annotation>
    2828  <xsd:documentation xml:lang="en">
    29     innotek VirtualBox Settings Schema Version 1.0-solaris.
    30     Copyright (c) 2004-2007 innotek GmbH.
     29    innotek VirtualBox Settings Schema (solaris).
     30    Copyright (c) 2004-2008 innotek GmbH.
    3131  </xsd:documentation>
    3232</xsd:annotation>
    3333
    3434<xsd:include schemaLocation="VirtualBox-settings-common.xsd"/>
     35
     36<!--
     37  this includes a computed VirtualBox element definition that contains
     38  a proper 'version' attribute constraint (e.g. recent verison number
     39  and platform suffix)
     40-->
     41<xsd:include schemaLocation="VirtualBox-settings-root.xsd"/>
    3542
    3643<!--
    … …  
    101108</xsd:complexType>
    102109
    103 <!--
    104 // Root element
    105 /////////////////////////////////////////////////////////////////////////
    106 -->
    107 
    108 <xsd:element name="VirtualBox">
    109   <xsd:complexType>
    110     <xsd:complexContent>
    111       <xsd:extension base="TVirtualBox">
    112         <xsd:attribute name="version" type="xsd:token" fixed="1.2-solaris" use="required"/>
    113       </xsd:extension>
    114     </xsd:complexContent>
    115   </xsd:complexType>
    116 </xsd:element>
    117 
    118110</xsd:schema>

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

    r6606 r7442  
    2727<xsd:annotation>
    2828  <xsd:documentation xml:lang="en">
    29     innotek VirtualBox Settings Schema Version 1.0-windows.
    30     Copyright (c) 2004-2007 innotek GmbH.
     29    innotek VirtualBox Settings Schema (windows).
     30    Copyright (c) 2004-2008 innotek GmbH.
    3131  </xsd:documentation>
    3232</xsd:annotation>
    3333
    3434<xsd:include schemaLocation="VirtualBox-settings-common.xsd"/>
     35
     36<!--
     37  this includes a computed VirtualBox element definition that contains
     38  a proper 'version' attribute constraint (e.g. recent verison number
     39  and platform suffix)
     40-->
     41<xsd:include schemaLocation="VirtualBox-settings-root.xsd"/>
    3542
    3643<!--
    … …  
    100107</xsd:complexType>
    101108
    102 <!--
    103 // Root element
    104 /////////////////////////////////////////////////////////////////////////
    105 -->
    106 
    107 <xsd:element name="VirtualBox">
    108   <xsd:complexType>
    109     <xsd:complexContent>
    110       <xsd:extension base="TVirtualBox">
    111         <xsd:attribute name="version" type="xsd:token" fixed="1.2-windows" use="required"/>
    112       </xsd:extension>
    113     </xsd:complexContent>
    114   </xsd:complexType>
    115 </xsd:element>
    116 
    117109</xsd:schema>
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