[libvirt] [PATCH] schema: bhyve and nmdm updates

* docs/schemas/domaincommon.rng: Add bhyve domain type, nmdm serial type and master and slave optional attributes for serial that are used by nmdm * tests/domainschematest: Add bhyvexml2argvdata directory to validate bhyve XMLs --- docs/schemas/domaincommon.rng | 8 ++++++++ tests/domainschematest | 1 + 2 files changed, 9 insertions(+) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f6f697c..7ace1c2 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -201,6 +201,7 @@ <value>vbox</value> <value>phyp</value> <value>parallels</value> + <value>bhyve</value> </choice> </attribute> </define> @@ -3010,6 +3011,7 @@ <value>pty</value> <value>spicevmc</value> <value>spiceport</value> + <value>nmdm</value> </choice> </define> @@ -3083,6 +3085,12 @@ <attribute name="channel"/> </optional> <optional> + <attribute name="master"/> + </optional> + <optional> + <attribute name="slave"/> + </optional> + <optional> <ref name='devSeclabel'/> </optional> </element> diff --git a/tests/domainschematest b/tests/domainschematest index 9ebf0b9..6d077ea 100755 --- a/tests/domainschematest +++ b/tests/domainschematest @@ -8,6 +8,7 @@ DIRS="" DIRS="$DIRS domainschemadata qemuxml2argvdata sexpr2xmldata" DIRS="$DIRS xmconfigdata xml2sexprdata qemuxml2xmloutdata " DIRS="$DIRS lxcxml2xmldata lxcxml2xmloutdata" +DIRS="$DIRS bhyvexml2argvdata" SCHEMA="domain.rng" check_schema "$DIRS" "$SCHEMA" -- 1.9.0

On 07/25/2014 10:43 AM, Roman Bogorodskiy wrote:
* docs/schemas/domaincommon.rng: Add bhyve domain type, nmdm serial type and master and slave optional attributes for serial that are used by nmdm * tests/domainschematest: Add bhyvexml2argvdata directory to validate bhyve XMLs --- docs/schemas/domaincommon.rng | 8 ++++++++ tests/domainschematest | 1 + 2 files changed, 9 insertions(+)
ACK; safe for 1.2.7.
+++ b/tests/domainschematest @@ -8,6 +8,7 @@ DIRS="" DIRS="$DIRS domainschemadata qemuxml2argvdata sexpr2xmldata" DIRS="$DIRS xmconfigdata xml2sexprdata qemuxml2xmloutdata "
Odd that this line has trailing whitespace embedded into $DIRS; if you want, you could clean that up before pushing.
DIRS="$DIRS lxcxml2xmldata lxcxml2xmloutdata" +DIRS="$DIRS bhyvexml2argvdata" SCHEMA="domain.rng"
check_schema "$DIRS" "$SCHEMA"
-- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

Eric Blake wrote:
On 07/25/2014 10:43 AM, Roman Bogorodskiy wrote:
* docs/schemas/domaincommon.rng: Add bhyve domain type, nmdm serial type and master and slave optional attributes for serial that are used by nmdm * tests/domainschematest: Add bhyvexml2argvdata directory to validate bhyve XMLs --- docs/schemas/domaincommon.rng | 8 ++++++++ tests/domainschematest | 1 + 2 files changed, 9 insertions(+)
ACK; safe for 1.2.7.
+++ b/tests/domainschematest @@ -8,6 +8,7 @@ DIRS="" DIRS="$DIRS domainschemadata qemuxml2argvdata sexpr2xmldata" DIRS="$DIRS xmconfigdata xml2sexprdata qemuxml2xmloutdata "
Odd that this line has trailing whitespace embedded into $DIRS; if you want, you could clean that up before pushing.
Thanks; pushed with the whitespace cleanup included. Roman Bogorodskiy
participants (2)
-
Eric Blake
-
Roman Bogorodskiy