VirtualBox

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


Ignore:
Timestamp:
May 24, 2024 4:44:18 PM (8 months ago)
Author:
vboxsync
Message:

Main/Makefile.kmk: Update the 'testvalidsettings' target for Solaris and
macOS to reference the locations of the global and machine-specific XML
schema files as used by default since VBox 4.0.20 (Oct. 2013) and 4.0.0
(Dec. 2010) respectively.

Main/xml/VirtualBox-settings.xsd: Bring the VirtualBox settings XML
schema up to date so that 'kmk testvalidsettings' can validate recent
and even not-so-recent settings configurations (based on a small sample
size of VMs - further changes may still be required). In addition to
adding the missing settings changes the recent breaking up of the TCPU
complex type element into a new TCPUX86 complex type element also
reordered the elements in the original TCPU element meaning that the
requirement for the child elements to be in sequential order via
'xsd:sequence' had to be changed to an unordered list of elements via
'xsd:all'.

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Main/Makefile.kmk

    r104782 r104783  
    897897
    898898 testvalidsettings: $(VBOX_XML_SCHEMA)
     899 if ("$(KBUILD_TARGET)" == "solaris")
     900        xmllint --schema $< --noout $(HOME)/.config/VirtualBox/VirtualBox.xml
     901        xmllint --schema $< --noout $(HOME)/VirtualBox\ VMs/*/*.vbox
     902 else if ("$(KBUILD_TARGET)" == "darwin")
     903        xmllint --schema $< --noout $(HOME)/Library/VirtualBox/VirtualBox.xml
     904        xmllint --schema $< --noout $(HOME)/VirtualBox\ VMs/*/*.vbox
     905 else
    899906        xmllint --schema $< --noout $(HOME)/.VirtualBox/VirtualBox.xml
    900907        xmllint --schema $< --noout $(HOME)/.VirtualBox/Machines/*/*.xml
    901908        xmllint --schema $< --noout $(HOME)/.VirtualBox/Machines/*/*.vbox
    902909        xmllint --schema $< --noout $(HOME)/VirtualBox\ VMs/*/*.vbox
     910 endif
    903911
    904912 OTHER_CLEAN += $(VBOX_XML_SCHEMADEFS_H) $(VBOX_XML_SCHEMADEFS_CPP)

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

    r104702 r104783  
    194194    <xsd:minInclusive value="1900-01-01T00:00:00Z"/>
    195195    <xsd:maxInclusive value="199999999-12-31T23:59:59Z"/>
    196     <xsd:pattern value=".+-.+-.+T.+:.+:[0-9]{2}Z"/>
     196    <xsd:pattern value=".+-.+-.+T.+:.+:[0-9]{2}.*Z"/>
    197197  </xsd:restriction>
    198198</xsd:simpleType>
    … …  
    415415  <xsd:sequence>
    416416    <xsd:element name="Description" type="xsd:string" minOccurs="0"/>
     417    <xsd:element name="Property" type="TProperty" minOccurs="0" maxOccurs="unbounded"/>
    417418  </xsd:sequence>
    418419  <xsd:attribute name="uuid" type="TNonNullUUID" use="required"/>
    419420  <xsd:attribute name="location" type="TLocalFile" use="required"/>
    420421  <xsd:attribute name="type" type="TMediumType"/>
     422  <xsd:attribute name="format" type="xsd:string"/>
    421423</xsd:complexType>
    422424
    … …  
    469471  <xsd:attribute name="exclusiveHwVirt" type="xsd:boolean"/> <!-- deprecated since v1.20 -->
    470472  <xsd:attribute name="proxyMode" type="xsd:string"/>
     473  <xsd:attribute name="proxyUrl" type="xsd:string"/>
     474</xsd:complexType>
     475
     476<xsd:complexType name="THostUpdates">
     477  <xsd:attribute name="enabled" type="xsd:boolean"/>
     478  <xsd:attribute name="channel" type="xsd:unsignedInt" default="1"/>
     479  <xsd:attribute name="checkFreqSec" type="xsd:unsignedInt" default="86400"/>
     480  <xsd:attribute name="repoUrl" type="xsd:string"/>
     481  <xsd:attribute name="lastCheckDate" type="TPresentDateTimeUTC"/>
     482  <xsd:attribute name="checkCount" type="xsd:unsignedInt"/>
     483</xsd:complexType>
     484
     485<xsd:complexType name="TUpdates">
     486  <xsd:sequence>
     487    <xsd:element name="Host" type="THostUpdates"/>
     488  </xsd:sequence>
     489  <xsd:attribute name="enabled" type="xsd:boolean"/>
    471490</xsd:complexType>
    472491
    … …  
    551570      </xsd:complexType>
    552571    </xsd:element>
     572    <xsd:element name="Updates" type="TUpdates"/>
    553573    <xsd:element name="SystemProperties" type="TSystemProperties"/>
    554574    <xsd:element name="ExtraData" type="TExtraData" minOccurs="0"/>
    … …  
    694714
    695715<xsd:complexType name="TCPU">
    696   <xsd:sequence>
     716  <xsd:all>
    697717    <xsd:element name="HardwareVirtEx" type="THWVirtExType" minOccurs="0"/> <!-- deprecated since v1.20. -->
    698718    <xsd:element name="HardwareVirtExNestedPaging" type="THWVirtExNestedPagingType" minOccurs="0"/> <!-- deprecated since v1.20. -->
    … …  
    700720    <xsd:element name="HardwareVirtExUX" type="THWVirtExUXType" minOccurs="0"/> <!-- deprecated since v1.20. -->
    701721    <xsd:element name="PAE" type="TPAEType" minOccurs="0"/> <!-- deprecated since v1.20. -->
     722    <xsd:element name="IBPBOn" type="TIBPBOn" minOccurs="0"/>
     723    <xsd:element name="SpecCtrl" type="TSpecCtrl" minOccurs="0"/>
     724    <xsd:element name="SpecCtrlByHost" type="TSpecCtrlByHost" minOccurs="0"/>
     725    <xsd:element name="L1DFlushOn" type="TL1DFlushOn" minOccurs="0"/>
     726    <xsd:element name="MDSClearOn" type="TMDSClearOn" minOccurs="0"/>
     727    <xsd:element name="NestedHWVirt" type="TNestedHWVirt" minOccurs="0"/>
     728    <xsd:element name="HardwareVirtExVirtVmsaveVmload" type="THardwareVirtExVirtVmsaveVmload" minOccurs="0"/>
    702729    <xsd:element name="LongMode" type="TLongModeType" minOccurs="0"/> <!-- deprecated since v1.20. -->
     730    <xsd:element name="TripleFaultReset" type="TTripleFaultReset" minOccurs="0"/>
     731    <xsd:element name="X2APIC" type="TX2APIC" minOccurs="0"/>
     732    <xsd:element name="APIC" type="TAPIC" minOccurs="0"/>
    703733    <xsd:element name="HardwareVirtExLargePages" type="THardwareVirtExLargePages" minOccurs="0"/> <!-- deprecated since v1.20. -->
    704734    <xsd:element name="HardwareVirtForce" type="THardwareVirtForce" minOccurs="0"/> <!-- deprecated since v1.20. -->
     735    <xsd:element name="HardwareVirtExUseNativeApi" type="THardwareVirtExUseNativeApi" minOccurs="0"/>
    705736    <xsd:element name="SyntheticCpu" type="TSyntheticCpuType" minOccurs="0"/>
    706737    <xsd:element name="CpuIdTree" type="TCpuIdTreeX86" minOccurs="0"> <!-- deprecated since v1.20. -->
    … …  
    710741      </xsd:unique>
    711742    </xsd:element>
    712   </xsd:sequence>
     743  </xsd:all>
    713744  <xsd:attribute name="count" type="TCPUCount" default="1"/>
    714745  <xsd:attribute name="hotplug" type="xsd:boolean" default="false"/>
    … …  
    855886      </xsd:complexType>
    856887    </xsd:element>
     888    <xsd:element name="AutoSerialNumGen" minOccurs="0">
     889      <xsd:complexType>
     890        <xsd:attribute name="enabled" type="xsd:boolean" default="true"/>
     891      </xsd:complexType>
     892    </xsd:element>
    857893    <xsd:element name="IDEController" minOccurs="0"> <!-- deprecated -->
    858894      <xsd:complexType>
    … …  
    869905    </xsd:element>
    870906  </xsd:all>
    871   <xsd:attribute name="type" type="TFirmwareType" use="required"/> <!-- new since v1.20. -->
     907  <xsd:attribute name="type" type="TFirmwareType" use="optional"/> <!-- new since v1.20. -->
    872908</xsd:complexType>
    873909
    … …  
    10041040  <xsd:attribute name="enabledIn" type="xsd:boolean" default="false"/>
    10051041  <xsd:attribute name="enabledOut" type="xsd:boolean" default="false"/>
     1042  <xsd:attribute name="useDefault" type="xsd:boolean" default="true"/>
    10061043  <xsd:attribute name="controller" default="AC97">
    10071044    <xsd:simpleType>
    … …  
    10131050    </xsd:simpleType>
    10141051  </xsd:attribute>
     1052  <xsd:attribute name="codec" default="AD1980"/>
    10151053  <xsd:attribute name="driver" use="required">
    10161054    <xsd:simpleType>
    … …  
    10721110  <xsd:attribute name="tcprcv" type="xsd:unsignedInt"/>
    10731111  <xsd:attribute name="tcpsnd" type="xsd:unsignedInt"/>
     1112  <xsd:attribute name="localhost-reachable" type="xsd:boolean" default="true"/>
    10741113</xsd:complexType>
    10751114
    … …  
    11741213  <xsd:attribute name="enabled" type="xsd:boolean" use="required"/>
    11751214  <xsd:attribute name="IRQ" type="TUInt8" use="required"/>
    1176   <xsd:attribute name="IOBase" type="TUInt16" use="required"/>
     1215  <xsd:attribute name="IOBase" type="TUInt16" use="optional"/>
     1216  <xsd:attribute name="IOAddress" type="TUInt16" use="optional"/>
    11771217  <xsd:attribute name="hostMode" type="TPortMode" use="required"/>
    11781218  <xsd:attribute name="path" type="TLocalFile"/>
    … …  
    12641304  <xsd:attribute name="writable" type="xsd:boolean" default="true"/>
    12651305  <xsd:attribute name="autoMount" type="xsd:boolean" default="false"/>
     1306  <xsd:attribute name="autoMountPoint" type="xsd:string"/>
    12661307</xsd:complexType>
    12671308
    … …  
    12741315<xsd:complexType name="TClipboard">
    12751316  <xsd:attribute name="mode" type="TClipboardMode" default="Disabled"/>
     1317  <xsd:attribute name="fileTransfersEnabled" type="xsd:boolean" default="false"/>
    12761318</xsd:complexType>
    12771319
    … …  
    13891431        <xsd:enumeration value="PS2Mouse"/>
    13901432        <xsd:enumeration value="ComboMouse"/>
     1433        <xsd:enumeration value="USBMultiTouch"/>
     1434        <xsd:enumeration value="USBMTScreenPlusPad"/>
    13911435      </xsd:restriction>
    13921436    </xsd:simpleType>
    … …  
    14131457        <xsd:enumeration value="PIIX3"/>
    14141458        <xsd:enumeration value="ICH9"/>
     1459        <xsd:enumeration value="ARMv8Virtual"/> <!-- new since v1.20. -->
    14151460      </xsd:restriction>
    14161461    </xsd:simpleType>
    … …  
    14671512
    14681513<xsd:complexType name="TPlatformX86"> <!-- new since v1.20. -->
     1514  <xsd:sequence>
     1515    <xsd:element name="CPU" type="TCPUX86" minOccurs="0"/>
     1516  </xsd:sequence>
    14691517</xsd:complexType>
    14701518
    … …  
    15611609  </xsd:all>
    15621610  <xsd:attribute name="version" type="xsd:string" default="2"/>
     1611  <xsd:attribute name="uuid" type="TNonNullUUID" use="optional"/>
    15631612</xsd:complexType>
    15641613
    … …  
    16061655    <xsd:element name="Description" type="xsd:string" minOccurs="0"/>
    16071656    <xsd:element name="Hardware" type="THardware"/>
     1657    <xsd:element name="Platform" type="TPlatform" minOccurs="0"/> <!-- new since v1.20. -->
    16081658    <xsd:element name="StorageControllers" type="TStorageControllers" minOccurs="0"/>
    16091659    <xsd:element name="Snapshots" minOccurs="0">
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