[libvirt] [PATCH 0/2] schema: Improve schema for the <os> element
Peter Krempa (2): schema: Visually separate <define> blocks in RNG schema: Allow interleaving the /domain/os/type element docs/schemas/domaincommon.rng | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) -- 2.2.2
It makes it visually obvious where the define ends. --- docs/schemas/domaincommon.rng | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f41ca43..d293747 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -70,6 +70,7 @@ </interleave> </element> </define> + <define name="seclabel"> <element name="seclabel"> <optional> @@ -146,6 +147,7 @@ </choice> </element> </define> + <define name="devSeclabel"> <element name="seclabel"> <!-- A per-device seclabel override is more limited, either @@ -182,6 +184,7 @@ </choice> </element> </define> + <define name="hvs"> <attribute name="type"> <choice> @@ -233,6 +236,7 @@ </group> </choice> </define> + <define name="oshvm"> <optional> <ref name="bootloader"/> @@ -300,6 +304,7 @@ </interleave> </element> </define> + <define name="ostypexen"> <element name="type"> <optional> @@ -325,6 +330,7 @@ </choice> </element> </define> + <define name="ostypehvm"> <element name="type"> <optional> @@ -342,6 +348,7 @@ <value>hvm</value> </element> </define> + <define name="hvmx86"> <group> <optional> @@ -361,6 +368,7 @@ </optional> </group> </define> + <define name="hvmmips"> <group> <optional> @@ -375,6 +383,7 @@ </optional> </group> </define> + <define name="hvmsparc"> <group> <optional> @@ -389,6 +398,7 @@ </optional> </group> </define> + <define name="hvmppc"> <group> <optional> @@ -408,6 +418,7 @@ </optional> </group> </define> + <define name="hvmppc64"> <group> <optional> @@ -424,6 +435,7 @@ </optional> </group> </define> + <define name="hvms390"> <group> <optional> @@ -446,6 +458,7 @@ </optional> </group> </define> + <define name="hvmarm"> <group> <optional> @@ -464,6 +477,7 @@ </optional> </group> </define> + <define name="hvmaarch64"> <group> <optional> @@ -482,6 +496,7 @@ </optional> </group> </define> + <define name="osexe"> <element name="os"> <element name="type"> -- 2.2.2
The element wasn't declared under the interleave thus it was required always to be first. This made it inconvenient when pasting new stuff to the XML manually in the "wrong" space. --- docs/schemas/domaincommon.rng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index d293747..4e5a0b3 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -242,8 +242,8 @@ <ref name="bootloader"/> </optional> <element name="os"> - <ref name="ostypehvm"/> <interleave> + <ref name="ostypehvm"/> <optional> <element name="loader"> <optional> -- 2.2.2
On Wed, Feb 25, 2015 at 11:21:57AM +0100, Peter Krempa wrote:
Peter Krempa (2): schema: Visually separate <define> blocks in RNG schema: Allow interleaving the /domain/os/type element
docs/schemas/domaincommon.rng | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
-- 2.2.2
ACK series, safe for freeze.
On Wed, Feb 25, 2015 at 11:34:44 +0100, Martin Kletzander wrote:
On Wed, Feb 25, 2015 at 11:21:57AM +0100, Peter Krempa wrote:
Peter Krempa (2): schema: Visually separate <define> blocks in RNG schema: Allow interleaving the /domain/os/type element
docs/schemas/domaincommon.rng | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
-- 2.2.2
ACK series, safe for freeze.
I've pushed 2/2 and dropped the space-adding patch as it was not complete. Thanks. Peter
participants (2)
-
Martin Kletzander -
Peter Krempa