[PATCH 5/6] schema: nodedev: Allow interneaving sub-elements of 'css' address type
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/conf/schemas/nodedev.rng | 40 ++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git a/src/conf/schemas/nodedev.rng b/src/conf/schemas/nodedev.rng
index a9b32bb80f..fba4021754 100644
--- a/src/conf/schemas/nodedev.rng
+++ b/src/conf/schemas/nodedev.rng
@@ -656,15 +656,17 @@
</define>
<define name="capccwaddress">
- <element name="cssid">
- <ref name="ccwCssidRange"/>
- </element>
- <element name="ssid">
- <ref name="ccwSsidRange"/>
- </element>
- <element name="devno">
- <ref name="ccwDevnoRange"/>
- </element>
+ <interleave>
+ <element name="cssid">
+ <ref name="ccwCssidRange"/>
+ </element>
+ <element name="ssid">
+ <ref name="ccwSsidRange"/>
+ </element>
+ <element name="devno">
+ <ref name="ccwDevnoRange"/>
+ </element>
+ </interleave>
</define>
<define name="capccwdev">
@@ -678,15 +680,17 @@
<attribute name="type">
<value>css</value>
</attribute>
- <ref name="capccwaddress"/>
- <optional>
- <element name="channel_dev_addr">
- <ref name="capccwaddress"/>
- </element>
- </optional>
- <optional>
- <ref name="mdev_types"/>
- </optional>
+ <interleave>
+ <ref name="capccwaddress"/>
+ <optional>
+ <element name="channel_dev_addr">
+ <ref name="capccwaddress"/>
+ </element>
+ </optional>
+ <optional>
+ <ref name="mdev_types"/>
+ </optional>
+ </interleave>
</define>
<define name="capvdpa">
--
2.39.1