summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Bentele2021-06-30 10:58:27 +0200
committerManuel Bentele2021-06-30 10:58:27 +0200
commitc01d5fc4e6c40e8eb005e6b95eafb4cd73baca66 (patch)
tree2a05d4c37eeb8f19eabb4a8acc1bdc44ff231d05
parentFix handling of multiple VirtualBox network adapters (diff)
downloadmaster-sync-shared-c01d5fc4e6c40e8eb005e6b95eafb4cd73baca66.tar.gz
master-sync-shared-c01d5fc4e6c40e8eb005e6b95eafb4cd73baca66.tar.xz
master-sync-shared-c01d5fc4e6c40e8eb005e6b95eafb4cd73baca66.zip
Update RNG schema files of Libvirt to version 7.3
-rw-r--r--src/main/resources/libvirt/rng/capability.rng8
-rw-r--r--src/main/resources/libvirt/rng/cputypes.rng1
-rw-r--r--src/main/resources/libvirt/rng/domaincaps.rng21
-rw-r--r--src/main/resources/libvirt/rng/domaincommon.rng814
-rw-r--r--src/main/resources/libvirt/rng/nodedev.rng43
5 files changed, 724 insertions, 163 deletions
diff --git a/src/main/resources/libvirt/rng/capability.rng b/src/main/resources/libvirt/rng/capability.rng
index 91a046e..c4cafc4 100644
--- a/src/main/resources/libvirt/rng/capability.rng
+++ b/src/main/resources/libvirt/rng/capability.rng
@@ -407,6 +407,14 @@
<ref name="unsignedInt"/>
</attribute>
</optional>
+ <optional>
+ <attribute name="deprecated">
+ <choice>
+ <value>yes</value>
+ <value>no</value>
+ </choice>
+ </attribute>
+ </optional>
<text/>
</element>
</define>
diff --git a/src/main/resources/libvirt/rng/cputypes.rng b/src/main/resources/libvirt/rng/cputypes.rng
index f66bc62..77c8fa7 100644
--- a/src/main/resources/libvirt/rng/cputypes.rng
+++ b/src/main/resources/libvirt/rng/cputypes.rng
@@ -9,6 +9,7 @@
<value>custom</value>
<value>host-model</value>
<value>host-passthrough</value>
+ <value>maximum</value>
</choice>
</attribute>
</define>
diff --git a/src/main/resources/libvirt/rng/domaincaps.rng b/src/main/resources/libvirt/rng/domaincaps.rng
index 0dbffb2..83d93ee 100644
--- a/src/main/resources/libvirt/rng/domaincaps.rng
+++ b/src/main/resources/libvirt/rng/domaincaps.rng
@@ -88,6 +88,7 @@
<define name="cpu">
<element name="cpu">
<ref name="cpuHost"/>
+ <ref name="cpuMax"/>
<ref name="cpuHostModel"/>
<ref name="cpuCustom"/>
</element>
@@ -105,6 +106,18 @@
</element>
</define>
+ <define name="cpuMax">
+ <element name="mode">
+ <attribute name="name">
+ <value>maximum</value>
+ </attribute>
+ <ref name="supported"/>
+ <optional>
+ <ref name="enum"/>
+ </optional>
+ </element>
+ </define>
+
<define name="cpuHostModel">
<element name="mode">
<attribute name="name">
@@ -138,6 +151,14 @@
<value>unknown</value>
</choice>
</attribute>
+ <optional>
+ <attribute name="deprecated">
+ <choice>
+ <value>yes</value>
+ <value>no</value>
+ </choice>
+ </attribute>
+ </optional>
<text/>
</element>
</zeroOrMore>
diff --git a/src/main/resources/libvirt/rng/domaincommon.rng b/src/main/resources/libvirt/rng/domaincommon.rng
index 7dc419b..a2e5c50 100644
--- a/src/main/resources/libvirt/rng/domaincommon.rng
+++ b/src/main/resources/libvirt/rng/domaincommon.rng
@@ -78,6 +78,9 @@
<ref name="qemucapabilities"/>
</optional>
<optional>
+ <ref name="qemudeprecation"/>
+ </optional>
+ <optional>
<ref name="lxcsharens"/>
</optional>
<optional>
@@ -277,6 +280,23 @@
</optional>
<ref name="ostypehvm"/>
<optional>
+ <element name="firmware">
+ <oneOrMore>
+ <element name="feature">
+ <attribute name="enabled">
+ <ref name="virYesNo"/>
+ </attribute>
+ <attribute name="name">
+ <choice>
+ <value>enrolled-keys</value>
+ <value>secure-boot</value>
+ </choice>
+ </attribute>
+ </element>
+ </oneOrMore>
+ </element>
+ </optional>
+ <optional>
<element name="loader">
<optional>
<attribute name="readonly">
@@ -1087,6 +1107,7 @@
<value>strict</value>
<value>preferred</value>
<value>interleave</value>
+ <value>restrictive</value>
</choice>
</attribute>
</optional>
@@ -1119,6 +1140,7 @@
<value>strict</value>
<value>preferred</value>
<value>interleave</value>
+ <value>restrictive</value>
</choice>
</attribute>
<attribute name="nodeset">
@@ -1209,6 +1231,7 @@
<value>boot</value>
<value>guest</value>
<value>wall</value>
+ <value>realtime</value>
</choice>
</attribute>
</optional>
@@ -1424,6 +1447,9 @@
<ref name="alias"/>
</optional>
<optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
<ref name="address"/>
</optional>
<optional>
@@ -1645,6 +1671,7 @@
<ref name="diskSourceNetwork"/>
<ref name="diskSourceVolume"/>
<ref name="diskSourceNvme"/>
+ <ref name="diskSourceVhostUser"/>
</choice>
</define>
@@ -2155,6 +2182,24 @@
</optional>
</define>
+ <define name="diskSourceVhostUser">
+ <attribute name="type">
+ <value>vhostuser</value>
+ </attribute>
+ <element name="source">
+ <attribute name="type">
+ <value>unix</value>
+ </attribute>
+ <attribute name="path">
+ <ref name="absFilePath"/>
+ </attribute>
+ <optional>
+ <ref name="reconnect"/>
+ </optional>
+ <empty/>
+ </element>
+ </define>
+
<define name="diskTarget">
<data type="string">
<param name="pattern">(ioemu:)?(fd|hd|sd|vd|xvd|ubd)[a-zA-Z0-9_]+</param>
@@ -2193,6 +2238,11 @@
<ref name="virOnOff"/>
</attribute>
</optional>
+ <optional>
+ <attribute name="rotation_rate">
+ <ref name="positiveInteger"/>
+ </attribute>
+ </optional>
</element>
</define>
<define name="geometry">
@@ -2391,6 +2441,9 @@
<ref name="alias"/>
</optional>
<optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
<ref name="address"/>
</optional>
<choice>
@@ -2710,9 +2763,18 @@
<ref name="fsBinary"/>
</optional>
<element name="source">
+ <choice>
+ <group>
<attribute name="dir">
<ref name="absDirPath"/>
</attribute>
+ </group>
+ <group>
+ <attribute name="socket">
+ <ref name="absFilePath"/>
+ </attribute>
+ </group>
+ </choice>
<empty/>
</element>
</interleave>
@@ -2774,10 +2836,12 @@
</group>
</choice>
<interleave>
+ <optional>
<element name="target">
<attribute name="dir"/>
<empty/>
</element>
+ </optional>
<optional>
<attribute name="accessmode">
<choice>
@@ -2813,9 +2877,15 @@
</element>
</optional>
<optional>
+ <ref name="deviceBoot"/>
+ </optional>
+ <optional>
<ref name="alias"/>
</optional>
<optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
<ref name="address"/>
</optional>
</interleave>
@@ -2915,6 +2985,18 @@
</element>
</optional>
<optional>
+ <element name="sandbox">
+ <optional>
+ <attribute name="mode">
+ <choice>
+ <value>namespace</value>
+ <value>chroot</value>
+ </choice>
+ </attribute>
+ </optional>
+ </element>
+ </optional>
+ <optional>
<element name="lock">
<optional>
<attribute name="posix">
@@ -3473,6 +3555,9 @@
<ref name="alias"/>
</optional>
<optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
<ref name="address"/>
</optional>
<optional>
@@ -3506,23 +3591,7 @@
<ref name="portOptions"/>
</optional>
<optional>
- <element name="teaming">
- <choice>
- <group>
- <attribute name="type">
- <value>persistent</value>
- </attribute>
- </group>
- <group>
- <attribute name="type">
- <value>transient</value>
- </attribute>
- <attribute name="persistent">
- <ref name="aliasName"/>
- </attribute>
- </group>
- </choice>
- </element>
+ <ref name="teaming"/>
</optional>
</interleave>
</define>
@@ -3558,6 +3627,27 @@
<ref name="route"/>
</zeroOrMore>
</define>
+
+ <define name="teaming">
+ <element name="teaming">
+ <choice>
+ <group>
+ <attribute name="type">
+ <value>persistent</value>
+ </attribute>
+ </group>
+ <group>
+ <attribute name="type">
+ <value>transient</value>
+ </attribute>
+ <attribute name="persistent">
+ <ref name="aliasName"/>
+ </attribute>
+ </group>
+ </choice>
+ </element>
+ </define>
+
<!--
An emulator description is just a path to the binary used for the task
-->
@@ -3635,6 +3725,11 @@
</choice>
</attribute>
</optional>
+ <optional>
+ <attribute name="powerControl">
+ <ref name="virYesNo"/>
+ </attribute>
+ </optional>
</group>
<group>
<optional>
@@ -3664,7 +3759,16 @@
<value>keep</value>
</attribute>
</optional>
- <ref name="listenElements"/>
+ <interleave>
+ <optional>
+ <element name="audio">
+ <attribute name="id">
+ <ref name="uint8"/>
+ </attribute>
+ </element>
+ </optional>
+ <ref name="listenElements"/>
+ </interleave>
</group>
<group>
<attribute name="type">
@@ -3967,120 +4071,125 @@
-->
<define name="video">
<element name="video">
- <optional>
- <element name="driver">
- <optional>
- <ref name="virtioOptions"/>
- </optional>
- <optional>
- <attribute name="name">
- <choice>
- <value>qemu</value>
- <value>vhostuser</value>
- </choice>
- </attribute>
- </optional>
- <optional>
- <attribute name="vgaconf">
- <choice>
- <value>io</value>
- <value>on</value>
- <value>off</value>
- </choice>
- </attribute>
- </optional>
- </element>
- </optional>
- <optional>
- <element name="model">
- <choice>
- <attribute name="type">
- <choice>
- <value>vga</value>
- <value>cirrus</value>
- <value>vmvga</value>
- <value>xen</value>
- <value>vbox</value>
- <value>virtio</value>
- <value>gop</value>
- <value>none</value>
- <value>bochs</value>
- <value>ramfb</value>
- </choice>
- </attribute>
- <group>
+ <interleave>
+ <optional>
+ <element name="driver">
+ <optional>
+ <ref name="virtioOptions"/>
+ </optional>
+ <optional>
+ <attribute name="name">
+ <choice>
+ <value>qemu</value>
+ <value>vhostuser</value>
+ </choice>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="vgaconf">
+ <choice>
+ <value>io</value>
+ <value>on</value>
+ <value>off</value>
+ </choice>
+ </attribute>
+ </optional>
+ </element>
+ </optional>
+ <optional>
+ <element name="model">
+ <choice>
<attribute name="type">
- <value>qxl</value>
+ <choice>
+ <value>vga</value>
+ <value>cirrus</value>
+ <value>vmvga</value>
+ <value>xen</value>
+ <value>vbox</value>
+ <value>virtio</value>
+ <value>gop</value>
+ <value>none</value>
+ <value>bochs</value>
+ <value>ramfb</value>
+ </choice>
</attribute>
- <optional>
- <attribute name="ram">
- <ref name="unsignedInt"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="vgamem">
- <ref name="unsignedInt"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="vram64">
- <ref name="unsignedInt"/>
- </attribute>
- </optional>
- </group>
- </choice>
- <optional>
- <attribute name="vram">
- <ref name="unsignedInt"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="heads">
- <ref name="unsignedInt"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="primary">
- <ref name="virYesNo"/>
- </attribute>
- </optional>
- <optional>
- <element name="acceleration">
- <optional>
- <attribute name="accel3d">
- <ref name="virYesNo"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="accel2d">
- <ref name="virYesNo"/>
- </attribute>
- </optional>
- <optional>
- <attribute name="rendernode">
- <ref name="absFilePath"/>
+ <group>
+ <attribute name="type">
+ <value>qxl</value>
</attribute>
- </optional>
- </element>
- </optional>
- <optional>
- <element name="resolution">
- <attribute name="x">
+ <optional>
+ <attribute name="ram">
+ <ref name="unsignedInt"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="vgamem">
+ <ref name="unsignedInt"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="vram64">
+ <ref name="unsignedInt"/>
+ </attribute>
+ </optional>
+ </group>
+ </choice>
+ <optional>
+ <attribute name="vram">
<ref name="unsignedInt"/>
</attribute>
- <attribute name="y">
+ </optional>
+ <optional>
+ <attribute name="heads">
<ref name="unsignedInt"/>
</attribute>
- </element>
- </optional>
- </element>
- </optional>
- <optional>
- <ref name="alias"/>
- </optional>
- <optional>
- <ref name="address"/>
- </optional>
+ </optional>
+ <optional>
+ <attribute name="primary">
+ <ref name="virYesNo"/>
+ </attribute>
+ </optional>
+ <optional>
+ <element name="acceleration">
+ <optional>
+ <attribute name="accel3d">
+ <ref name="virYesNo"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="accel2d">
+ <ref name="virYesNo"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="rendernode">
+ <ref name="absFilePath"/>
+ </attribute>
+ </optional>
+ </element>
+ </optional>
+ <optional>
+ <element name="resolution">
+ <attribute name="x">
+ <ref name="unsignedInt"/>
+ </attribute>
+ <attribute name="y">
+ <ref name="unsignedInt"/>
+ </attribute>
+ </element>
+ </optional>
+ </element>
+ </optional>
+ <optional>
+ <ref name="alias"/>
+ </optional>
+ <optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
+ <ref name="address"/>
+ </optional>
+ </interleave>
</element>
</define>
<!--
@@ -4218,6 +4327,9 @@
<ref name="alias"/>
</optional>
<optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
<ref name="address"/>
</optional>
</interleave>
@@ -4470,6 +4582,9 @@
<ref name="alias"/>
</optional>
<optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
<ref name="address"/>
</optional>
<optional>
@@ -4485,32 +4600,367 @@
</interleave>
</element>
</define>
+
+ <define name="audiocommonattr">
+ <optional>
+ <attribute name="mixingEngine">
+ <ref name="virYesNo"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="fixedSettings">
+ <ref name="virYesNo"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="voices">
+ <ref name="uint32"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="bufferLength">
+ <ref name="uint32"/>
+ </attribute>
+ </optional>
+ </define>
+
+ <define name="audiocommonchild">
+ <optional>
+ <element name="settings">
+ <optional>
+ <attribute name="frequency">
+ <ref name="uint32"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="channels">
+ <ref name="uint32"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="format">
+ <choice>
+ <value>s8</value>
+ <value>u8</value>
+ <value>s16</value>
+ <value>u16</value>
+ <value>s32</value>
+ <value>u32</value>
+ <value>f32</value>
+ </choice>
+ </attribute>
+ </optional>
+ </element>
+ </optional>
+ </define>
+
+ <define name="audionone">
+ <ref name="audiocommonattr"/>
+ <ref name="audiocommonchild"/>
+ </define>
+
+ <define name="audioalsa">
+ <ref name="audiocommonattr"/>
+ <optional>
+ <attribute name="dev">
+ <ref name="filePath"/>
+ </attribute>
+ </optional>
+ <ref name="audiocommonchild"/>
+ </define>
+
+ <define name="audiocoreaudio">
+ <ref name="audiocommonattr"/>
+ <optional>
+ <attribute name="bufferCount">
+ <ref name="uint32"/>
+ </attribute>
+ </optional>
+ <ref name="audiocommonchild"/>
+ </define>
+
+ <define name="audiojack">
+ <ref name="audiocommonattr"/>
+ <optional>
+ <attribute name="serverName">
+ <data type="string"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="clientName">
+ <data type="string"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="connectPorts">
+ <data type="string"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="exactName">
+ <ref name="virYesNo"/>
+ </attribute>
+ </optional>
+ <ref name="audiocommonchild"/>
+ </define>
+
+ <define name="audiooss">
+ <ref name="audiocommonattr"/>
+ <optional>
+ <attribute name="dev">
+ <ref name="deviceName"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="bufferCount">
+ <ref name="uint32"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="tryPoll">
+ <ref name="virYesNo"/>
+ </attribute>
+ </optional>
+ <ref name="audiocommonchild"/>
+ </define>
+
+ <define name="audiopulseaudio">
+ <ref name="audiocommonattr"/>
+ <optional>
+ <attribute name="name">
+ <data type="string"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="streamName">
+ <data type="string"/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name="latency">
+ <ref name="uint32"/>
+ </attribute>
+ </optional>
+ <ref name="audiocommonchild"/>
+ </define>
+
+ <define name="audiosdl">
+ <ref name="audiocommonattr"/>
+ <optional>
+ <attribute name="bufferCount">
+ <ref name="uint32"/>
+ </attribute>
+ </optional>
+ <ref name="audiocommonchild"/>
+ </define>
+
+ <define name="audiospice">
+ <ref name="audiocommonattr"/>
+ <ref name="audiocommonchild"/>
+ </define>
+
+ <define name="audiofile">
+ <ref name="audiocommonattr"/>
+ <ref name="audiocommonchild"/>
+ </define>
+
<define name="audio">
<element name="audio">
<attribute name="id">
<ref name="uint8"/>
</attribute>
- <attribute name="type">
- <choice>
- <value>oss</value>
- </choice>
- </attribute>
- <interleave>
- <optional>
- <element name="input">
- <attribute name="dev">
- <ref name="deviceName"/>
+ <choice>
+ <group>
+ <attribute name="type">
+ <value>none</value>
+ </attribute>
+ <interleave>
+ <optional>
+ <element name="input">
+ <ref name="audionone"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="output">
+ <ref name="audionone"/>
+ </element>
+ </optional>
+ </interleave>
+ </group>
+ <group>
+ <attribute name="type">
+ <value>alsa</value>
+ </attribute>
+ <interleave>
+ <optional>
+ <element name="input">
+ <ref name="audioalsa"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="output">
+ <ref name="audioalsa"/>
+ </element>
+ </optional>
+ </interleave>
+ </group>
+ <group>
+ <attribute name="type">
+ <value>coreaudio</value>
+ </attribute>
+ <interleave>
+ <optional>
+ <element name="input">
+ <ref name="audiocoreaudio"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="output">
+ <ref name="audiocoreaudio"/>
+ </element>
+ </optional>
+ </interleave>
+ </group>
+ <group>
+ <attribute name="type">
+ <value>jack</value>
+ </attribute>
+ <interleave>
+ <optional>
+ <element name="input">
+ <ref name="audiojack"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="output">
+ <ref name="audiojack"/>
+ </element>
+ </optional>
+ </interleave>
+ </group>
+ <group>
+ <attribute name="type">
+ <choice>
+ <value>oss</value>
+ </choice>
+ </attribute>
+ <optional>
+ <attribute name="tryMMap">
+ <ref name="virYesNo"/>
</attribute>
- </element>
- </optional>
- <optional>
- <element name="output">
- <attribute name="dev">
- <ref name="deviceName"/>
+ </optional>
+ <optional>
+ <attribute name="exclusive">
+ <ref name="virYesNo"/>
</attribute>
- </element>
- </optional>
- </interleave>
+ </optional>
+ <optional>
+ <attribute name="dspPolicy">
+ <data type="int"/>
+ </attribute>
+ </optional>
+ <interleave>
+ <optional>
+ <element name="input">
+ <ref name="audiooss"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="output">
+ <ref name="audiooss"/>
+ </element>
+ </optional>
+ </interleave>
+ </group>
+ <group>
+ <attribute name="type">
+ <value>pulseaudio</value>
+ </attribute>
+ <optional>
+ <attribute name="serverName">
+ <data type="string"/>
+ </attribute>
+ </optional>
+ <interleave>
+ <optional>
+ <element name="input">
+ <ref name="audiopulseaudio"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="output">
+ <ref name="audiopulseaudio"/>
+ </element>
+ </optional>
+ </interleave>
+ </group>
+ <group>
+ <attribute name="type">
+ <value>sdl</value>
+ </attribute>
+ <optional>
+ <attribute name="driver">
+ <choice>
+ <value>esd</value>
+ <value>alsa</value>
+ <value>arts</value>
+ <value>pulseaudio</value>
+ </choice>
+ </attribute>
+ </optional>
+ <interleave>
+ <optional>
+ <element name="input">
+ <ref name="audiosdl"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="output">
+ <ref name="audiosdl"/>
+ </element>
+ </optional>
+ </interleave>
+ </group>
+ <group>
+ <attribute name="type">
+ <value>spice</value>
+ </attribute>
+ <interleave>
+ <optional>
+ <element name="input">
+ <ref name="audiospice"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="output">
+ <ref name="audiospice"/>
+ </element>
+ </optional>
+ </interleave>
+ </group>
+ <group>
+ <attribute name="type">
+ <value>file</value>
+ </attribute>
+ <optional>
+ <attribute name="path">
+ <ref name="filePath"/>
+ </attribute>
+ </optional>
+ <interleave>
+ <optional>
+ <element name="input">
+ <ref name="audiofile"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="output">
+ <ref name="audiofile"/>
+ </element>
+ </optional>
+ </interleave>
+ </group>
+ </choice>
</element>
</define>
<define name="watchdog">
@@ -4539,6 +4989,9 @@
<ref name="alias"/>
</optional>
<optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
<ref name="address"/>
</optional>
</element>
@@ -4608,6 +5061,9 @@
<ref name="alias"/>
</optional>
<optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
<ref name="address"/>
</optional>
</interleave>
@@ -4640,6 +5096,9 @@
<ref name="alias"/>
</optional>
<optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
<ref name="address"/>
</optional>
<optional>
@@ -4718,6 +5177,9 @@
<ref name="alias"/>
</optional>
<optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
<ref name="address"/>
</optional>
</interleave>
@@ -4762,6 +5224,9 @@
<ref name="alias"/>
</optional>
<optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
<ref name="address"/>
</optional>
</element>
@@ -4789,6 +5254,9 @@
<ref name="alias"/>
</optional>
<optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
<ref name="address"/>
</optional>
</element>
@@ -4883,6 +5351,14 @@
<optional>
<ref name="alias"/>
</optional>
+ <optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
+ <element name="driver">
+ <ref name="virtioOptions"/>
+ </element>
+ </optional>
</interleave>
</element>
</define>
@@ -4981,6 +5457,9 @@
<ref name="alias"/>
</optional>
<optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
<ref name="address"/>
</optional>
</interleave>
@@ -4996,6 +5475,9 @@
<ref name="alias"/>
</optional>
<optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
<ref name="address"/>
</optional>
</interleave>
@@ -5015,6 +5497,9 @@
<ref name="alias"/>
</optional>
<optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
<ref name="address"/>
</optional>
<optional>
@@ -5046,6 +5531,9 @@
<ref name="alias"/>
</optional>
<optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
<ref name="deviceBoot"/>
</optional>
<optional>
@@ -5123,6 +5611,9 @@
<empty/>
</element>
</optional>
+ <optional>
+ <ref name="teaming"/>
+ </optional>
<element name="source">
<optional>
<ref name="startupPolicy"/>
@@ -6013,12 +6504,23 @@
</element>
</define>
+ <define name="acpi">
+ <element name="acpi">
+ <optional>
+ <attribute name="index">
+ <ref name="unsignedInt"/>
+ </attribute>
+ </optional>
+ </element>
+ </define>
+
<define name="memorydev">
<element name="memory">
<attribute name="model">
<choice>
<value>dimm</value>
<value>nvdimm</value>
+ <value>virtio-pmem</value>
</choice>
</attribute>
<optional>
@@ -6050,6 +6552,9 @@
<optional>
<ref name="alias"/>
</optional>
+ <optional>
+ <ref name="acpi"/>
+ </optional>
</interleave>
</element>
</define>
@@ -6142,6 +6647,9 @@
<ref name="alias"/>
</optional>
<optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
<ref name="address"/>
</optional>
</interleave>
@@ -6860,6 +7368,19 @@
</element>
</define>
+ <define name="qemudeprecation">
+ <element name="deprecation" ns="http://libvirt.org/schemas/domain/qemu/1.0">
+ <attribute name="behavior">
+ <choice>
+ <value>none</value>
+ <value>omit</value>
+ <value>reject</value>
+ <value>crash</value>
+ </choice>
+ </attribute>
+ </element>
+ </define>
+
<!--
Optional hypervisor extensions in their own namespace:
@@ -6973,7 +7494,7 @@
<define name="cpuquota">
<data type="long">
<param name="pattern">-?[0-9]+</param>
- <param name="maxInclusive">18446744073709551</param>
+ <param name="maxInclusive">17592186044415</param>
<param name="minInclusive">-1</param>
</data>
</define>
@@ -7121,6 +7642,9 @@
<ref name="alias"/>
</optional>
<optional>
+ <ref name="acpi"/>
+ </optional>
+ <optional>
<ref name="address"/>
</optional>
</interleave>
diff --git a/src/main/resources/libvirt/rng/nodedev.rng b/src/main/resources/libvirt/rng/nodedev.rng
index 5840dc9..777227c 100644
--- a/src/main/resources/libvirt/rng/nodedev.rng
+++ b/src/main/resources/libvirt/rng/nodedev.rng
@@ -606,27 +606,34 @@
</define>
<define name="capmdev">
- <attribute name="type">
- <value>mdev</value>
- </attribute>
- <element name="type">
- <attribute name="id">
- <data type="string"/>
+ <interleave>
+ <attribute name="type">
+ <value>mdev</value>
</attribute>
- </element>
- <optional>
- <element name="iommuGroup">
- <attribute name="number">
- <ref name="unsignedInt"/>
+ <element name="type">
+ <attribute name="id">
+ <data type="string"/>
</attribute>
</element>
- </optional>
- <zeroOrMore>
- <element name="attr">
- <attribute name="name"/>
- <attribute name="value"/>
- </element>
- </zeroOrMore>
+ <optional>
+ <element name="iommuGroup">
+ <attribute name="number">
+ <ref name="unsignedInt"/>
+ </attribute>
+ </element>
+ </optional>
+ <optional>
+ <element name="uuid">
+ <ref name="UUID"/>
+ </element>
+ </optional>
+ <zeroOrMore>
+ <element name="attr">
+ <attribute name="name"/>
+ <attribute name="value"/>
+ </element>
+ </zeroOrMore>
+ </interleave>
</define>
<define name="capccwdev">