Update XML schema for VirtualBox virtualization configurations

3 files changed, 59 insertions, 44 deletions

diff --git a/pom.xml b/pom.xml
index ff2d062..944b225 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,7 @@
 					<include>libvirt/libosinfo/xml/*</include>
 					<include>libvirt/rng/*</include>
 					<include>libvirt/xsl/*</include>
+					<include>virtualbox/xsd/*</include>
 				</includes>
 			</resource>
 		</resources>
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java
index a0e1a1f..5b74e52 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java
@@ -91,7 +91,7 @@ public class VirtualizationConfigurationVirtualboxFileFormat
 		// first validate xml
 		try {
 			SchemaFactory factory = SchemaFactory.newInstance( XMLConstants.W3C_XML_SCHEMA_NS_URI );
-			InputStream xsdStream = VirtualizationConfigurationVirtualboxFileFormat.class.getResourceAsStream( "/master-sync-shared/xml/VirtualBox-settings.xsd" );
+			InputStream xsdStream = VirtualizationConfigurationVirtualboxFileFormat.class.getResourceAsStream( "/virtualbox/xsd/VirtualBox-settings.xsd" );
 			if ( xsdStream == null ) {
 				LOGGER.warn( "Cannot validate Vbox XML: No XSD found in JAR" );
 			} else {
diff --git a/src/main/resources/master-sync-shared/xml/VirtualBox-settings.xsd b/src/main/resources/virtualbox/xsd/VirtualBox-settings.xsd
index aa38646..396cc14 100644
--- a/src/main/resources/master-sync-shared/xml/VirtualBox-settings.xsd
+++ b/src/main/resources/virtualbox/xsd/VirtualBox-settings.xsd
@@ -6,7 +6,7 @@
  *  Oracle VM VirtualBox Settings Schema
  *  Common definitions
 
-    Copyright (C) 2004-2017 Oracle Corporation
+    Copyright (C) 2004-2020 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
@@ -28,7 +28,7 @@
 <xsd:annotation>
   <xsd:documentation xml:lang="en">
     Oracle VM VirtualBox Settings Schema (common definitions).
-    Copyright (c) 2004-2017 Oracle Corporation
+    Copyright (c) 2004-2020 Oracle Corporation
   </xsd:documentation>
 </xsd:annotation>
 
@@ -136,6 +136,17 @@
   </xsd:restriction>
 </xsd:simpleType>
 
+<xsd:simpleType name="TVMProcPriority">
+  <xsd:restriction base="xsd:string">
+    <xsd:enumeration value="Invalid"/>
+    <xsd:enumeration value="Default"/>
+    <xsd:enumeration value="Flat"/>
+    <xsd:enumeration value="Low"/>
+    <xsd:enumeration value="Normal"/>
+    <xsd:enumeration value="High"/>
+  </xsd:restriction>
+</xsd:simpleType>
+
 <xsd:simpleType name="TMonitorCount">
   <xsd:restriction base="xsd:unsignedInt">
     <xsd:minInclusive value="1"/>
@@ -179,6 +190,7 @@
   <xsd:restriction base="xsd:string">
     <xsd:enumeration value="Am79C970A"/>
     <xsd:enumeration value="Am79C973"/>
+    <xsd:enumeration value="Am79C960"/>
     <xsd:enumeration value="82540EM"/>
     <xsd:enumeration value="82543GC"/>
     <xsd:enumeration value="82545EM"/>
@@ -245,6 +257,30 @@
   </xsd:restriction>
 </xsd:simpleType>
 
+<xsd:simpleType name="TStorageControllerType">
+  <xsd:restriction base="xsd:token">
+    <xsd:enumeration value="AHCI"/>
+    <xsd:enumeration value="LsiLogic"/>
+    <xsd:enumeration value="BusLogic"/>
+    <xsd:enumeration value="PIIX3"/>
+    <xsd:enumeration value="PIIX4"/>
+    <xsd:enumeration value="ICH6"/>
+    <xsd:enumeration value="LsiLogicSas"/>
+    <xsd:enumeration value="I82078"/>
+    <xsd:enumeration value="USB"/>
+    <xsd:enumeration value="NVMe"/>
+    <xsd:enumeration value="VirtioSCSI"/>
+  </xsd:restriction>
+</xsd:simpleType>
+
+<xsd:simpleType name="TDisplayControllerType">
+  <xsd:restriction base="xsd:token">
+    <xsd:enumeration value="VBoxVGA"/>
+    <xsd:enumeration value="VMSVGA"/>
+    <xsd:enumeration value="VBoxSVGA"/>
+  </xsd:restriction>
+</xsd:simpleType>
+
 <!--
 // Complex types
 /////////////////////////////////////////////////////////////////////////
@@ -409,6 +445,7 @@
   <xsd:attribute name="LogHistoryCount" type="xsd:unsignedInt" default="3"/>
   <xsd:attribute name="defaultVRDEExtPack" type="xsd:string"/>
   <xsd:attribute name="exclusiveHwVirt" type="xsd:boolean"/>
+  <xsd:attribute name="proxyMode" type="xsd:string"/>
 </xsd:complexType>
 
 <xsd:complexType name="TExtraData">
@@ -536,7 +573,7 @@
 <xsd:simpleType name="TCPUCount">
   <xsd:restriction base="xsd:unsignedInt">
     <xsd:minInclusive value="1"/>
-    <xsd:maxInclusive value="32"/>
+    <xsd:maxInclusive value="64"/>
   </xsd:restriction>
 </xsd:simpleType>
 
@@ -555,10 +592,6 @@
   </xsd:sequence>
 </xsd:complexType>
 
-<xsd:complexType name="TX2APIC">
-  <xsd:attribute name="enabled" type="xsd:boolean"/>
-</xsd:complexType>
-
 <xsd:complexType name="TCPU">
   <xsd:sequence>
     <xsd:element name="HardwareVirtEx" type="THWVirtExType" minOccurs="0"/>
@@ -567,7 +600,6 @@
     <xsd:element name="HardwareVirtExUX" type="THWVirtExUXType" minOccurs="0"/>
     <xsd:element name="PAE" type="TPAEType" minOccurs="0"/>
     <xsd:element name="LongMode" type="TLongModeType" minOccurs="0"/>
-    <xsd:element name="X2APIC" type="TX2APIC" minOccurs="0"/>
     <xsd:element name="HardwareVirtExLargePages" type="THardwareVirtExLargePages" minOccurs="0"/>
     <xsd:element name="HardwareVirtForce" type="THardwareVirtForce" minOccurs="0"/>
     <xsd:element name="SyntheticCpu" type="TSyntheticCpuType" minOccurs="0"/>
@@ -613,6 +645,7 @@
   <xsd:attribute name="MonitorCount" type="TMonitorCount"/> <!-- deprecated -->
   <xsd:attribute name="accelerate3D" type="xsd:boolean" default="false"/>
   <xsd:attribute name="accelerate2DVideo" type="xsd:boolean" default="false"/>
+  <xsd:attribute name="controller" type="TDisplayControllerType" default="VBoxSVGA"/>
 </xsd:complexType>
 
 <xsd:complexType name="TVideoRecording">
@@ -710,6 +743,17 @@
         <xsd:attribute name="enabled" type="xsd:boolean" default="false"/>
       </xsd:complexType>
     </xsd:element>
+    <xsd:element name="NVRAM" minOccurs="0">
+      <xsd:complexType>
+        <xsd:attribute name="enabled" type="xsd:boolean" default="false"/>
+        <xsd:attribute name="path" type="xsd:string"/>
+      </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="SmbiosUuidLittleEndian" minOccurs="0">
+      <xsd:complexType>
+          <xsd:attribute name="enabled" type="xsd:boolean" default="false"/>
+      </xsd:complexType>
+    </xsd:element>
     <xsd:element name="IDEController" minOccurs="0"> <!-- deprecated -->
       <xsd:complexType>
         <xsd:attribute name="type">
@@ -747,22 +791,7 @@
                  minOccurs="0" maxOccurs="unbounded"/>
   </xsd:sequence>
   <xsd:attribute name="name" type="xsd:string" use="required"/>
-  <xsd:attribute name="type" use="required">
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="AHCI"/>
-      <xsd:enumeration value="LsiLogic"/>
-      <xsd:enumeration value="BusLogic"/>
-      <xsd:enumeration value="PIIX3"/>
-      <xsd:enumeration value="PIIX4"/>
-      <xsd:enumeration value="ICH6"/>
-      <xsd:enumeration value="LsiLogicSas"/>
-      <xsd:enumeration value="I82078"/>
-      <xsd:enumeration value="USB"/>
-      <xsd:enumeration value="NVMe"/>
-      </xsd:restriction>
-    </xsd:simpleType>
-  </xsd:attribute>
+  <xsd:attribute name="type" type="TStorageControllerType" use="required"/>
   <xsd:attribute name="PortCount"   type="xsd:unsignedInt" use="required"/>
   <xsd:attribute name="useHostIOCache" type="xsd:boolean"  use="optional" default="true"/>
   <xsd:attribute name="Bootable"    type="xsd:boolean"     use="optional"/>
@@ -871,6 +900,8 @@
 
 <xsd:complexType name="TAudioAdapter">
   <xsd:attribute name="enabled" type="xsd:boolean" default="false"/>
+  <xsd:attribute name="enabledIn" type="xsd:boolean" default="false"/>
+  <xsd:attribute name="enabledOut" type="xsd:boolean" default="false"/>
   <xsd:attribute name="controller" default="AC97">
     <xsd:simpleType>
       <xsd:restriction base="xsd:token">
@@ -1140,7 +1171,7 @@
 </xsd:complexType>
 
 <xsd:complexType name="TClipboard">
-  <xsd:attribute name="mode" type="TClipboardMode" use="required"/>
+  <xsd:attribute name="mode" type="TClipboardMode" default="Disabled"/>
 </xsd:complexType>
 
 <xsd:complexType name="TDragAndDrop">
@@ -1312,22 +1343,6 @@
   <xsd:attribute name="password" type="xsd:string"/>
 </xsd:complexType>
 
-<xsd:complexType name="TFaultTolerance">
-  <xsd:attribute name="state" use="required">
-    <xsd:simpleType>
-      <xsd:restriction base="xsd:token">
-        <xsd:enumeration value="inactive"/>
-        <xsd:enumeration value="master"/>
-        <xsd:enumeration value="standby"/>
-      </xsd:restriction>
-    </xsd:simpleType>
-  </xsd:attribute>
-  <xsd:attribute name="port" type="xsd:unsignedShort"/>
-  <xsd:attribute name="address" type="xsd:string"/>
-  <xsd:attribute name="interval" type="xsd:unsignedInt"/>
-  <xsd:attribute name="password" type="xsd:string"/>
-</xsd:complexType>
-
 <xsd:complexType name="THardware">
   <xsd:all>
     <xsd:element name="CPU" type="TCPU" minOccurs="0"/>
@@ -1406,7 +1421,6 @@
     <xsd:element name="StorageControllers" type="TStorageControllers" minOccurs="0"/>
   </xsd:all>
   <xsd:attribute name="version" type="xsd:string" default="2"/>
-  <xsd:attribute name="uuid" type="TNonNullUUID" use="optional"/>
 </xsd:complexType>
 
 <xsd:complexType name="TGroup">
@@ -1424,7 +1438,6 @@
     <xsd:element name="MediaRegistry" type="TMediaRegistry" minOccurs="0"/>
     <xsd:element name="Description" type="xsd:string" minOccurs="0"/>
     <xsd:element name="Teleporter" type="TTeleporter" minOccurs="0"/>
-    <xsd:element name="FaultTolerance" type="TFaultTolerance" minOccurs="0"/>
     <xsd:element name="Hardware" type="THardware"/>
     <xsd:element name="StorageControllers" type="TStorageControllers" minOccurs="0"/>
     <xsd:element name="HardDiskAttachments" type="THardDiskAttachments" minOccurs="0"/> <!-- deprecated -->
@@ -1444,6 +1457,7 @@
   <xsd:attribute name="aborted" type="xsd:boolean" default="false"/>
   <xsd:attribute name="currentStateModified" type="xsd:boolean" default="true"/>
   <xsd:attribute name="version" type="xsd:string" default="1.15"/> <!-- Used for OVF files only, must not be present in normal settings files. The default corresponds to settings created by 5.0, which covers many older versions but not newer ones. -->
+  <xsd:attribute name="VMProcessPriority" type="TVMProcPriority"/>
 </xsd:complexType>
 
 <xsd:complexType name="TSnapshot">