mirror of https://gitee.com/openkylin/libvirt.git
conf: create common storage RNG grammar file
Having two tiny files with a couple definitions didn't make as much sense as one common file, especially since I plan to add more definitions and use it in more places. * docs/schemas/storageencryption.rng: Merge this... * docs/schemas/storagefilefeatures.rng: ...and this, into... * docs/schemas/storagecommon.rng: ...this new file. * docs/schemas/Makefile.am (schema_DATA): Reflect renames. * docs/schemas/storagevol.rng: Likewise. * docs/schemas/domaincommon.rng: Likewise. * libvirt.spec.in: Likewise. * mingw-libvirt.spec.in: Likewise. Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake
parent
c4206d7c7e
commit
110c0db88c
|
|
@ -1,4 +1,4 @@
|
|||
## Copyright (C) 2005-2011, 2013 Red Hat, Inc.
|
||||
## Copyright (C) 2005-2011, 2013-2014 Red Hat, Inc.
|
||||
##
|
||||
## This library is free software; you can redistribute it and/or
|
||||
## modify it under the terms of the GNU Lesser General Public
|
||||
|
|
@ -27,8 +27,7 @@ schema_DATA = \
|
|||
nodedev.rng \
|
||||
nwfilter.rng \
|
||||
secret.rng \
|
||||
storageencryption.rng \
|
||||
storagefilefeatures.rng \
|
||||
storagecommon.rng \
|
||||
storagepool.rng \
|
||||
storagevol.rng
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
||||
<!-- domain-related definitions used in multiple grammars -->
|
||||
<include href='basictypes.rng'/>
|
||||
<include href='storageencryption.rng'/>
|
||||
<include href='storagecommon.rng'/>
|
||||
<include href='networkcommon.rng'/>
|
||||
|
||||
<!--
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
<?xml version="1.0"?>
|
||||
<!-- A Relax NG schema for the libvirt volume encryption XML format -->
|
||||
<!-- A Relax NG schema for common libvirt XML storage elements -->
|
||||
<grammar xmlns="http://relaxng.org/ns/structure/1.0"
|
||||
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
||||
|
||||
<!-- This schema is not designed for standalone use; another file
|
||||
must include both this file and basictypes.rng -->
|
||||
|
||||
<define name='encryption'>
|
||||
<element name='encryption'>
|
||||
<attribute name='format'>
|
||||
|
|
@ -30,4 +33,23 @@
|
|||
</element>
|
||||
</define>
|
||||
|
||||
<define name='compat'>
|
||||
<element name='compat'>
|
||||
<data type='string'>
|
||||
<param name='pattern'>[0-9]+\.[0-9]+</param>
|
||||
</data>
|
||||
</element>
|
||||
</define>
|
||||
<define name='fileFormatFeatures'>
|
||||
<element name='features'>
|
||||
<interleave>
|
||||
<optional>
|
||||
<element name='lazy_refcounts'>
|
||||
<empty/>
|
||||
</element>
|
||||
</optional>
|
||||
</interleave>
|
||||
</element>
|
||||
</define>
|
||||
|
||||
</grammar>
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<!-- A Relax NG schema for the libvirt volume features XML format -->
|
||||
<grammar xmlns="http://relaxng.org/ns/structure/1.0"
|
||||
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
||||
|
||||
<define name='compat'>
|
||||
<element name='compat'>
|
||||
<data type='string'>
|
||||
<param name='pattern'>[0-9]+\.[0-9]+</param>
|
||||
</data>
|
||||
</element>
|
||||
</define>
|
||||
<define name='fileFormatFeatures'>
|
||||
<element name='features'>
|
||||
<interleave>
|
||||
<optional>
|
||||
<element name='lazy_refcounts'>
|
||||
<empty/>
|
||||
</element>
|
||||
</optional>
|
||||
</interleave>
|
||||
</element>
|
||||
</define>
|
||||
</grammar>
|
||||
|
|
@ -7,8 +7,7 @@
|
|||
<ref name='vol'/>
|
||||
</start>
|
||||
|
||||
<include href='storageencryption.rng'/>
|
||||
<include href='storagefilefeatures.rng'/>
|
||||
<include href='storagecommon.rng'/>
|
||||
|
||||
|
||||
<define name='vol'>
|
||||
|
|
|
|||
|
|
@ -2171,8 +2171,7 @@ exit 0
|
|||
%{_datadir}/libvirt/schemas/nodedev.rng
|
||||
%{_datadir}/libvirt/schemas/nwfilter.rng
|
||||
%{_datadir}/libvirt/schemas/secret.rng
|
||||
%{_datadir}/libvirt/schemas/storageencryption.rng
|
||||
%{_datadir}/libvirt/schemas/storagefilefeatures.rng
|
||||
%{_datadir}/libvirt/schemas/storagecommon.rng
|
||||
%{_datadir}/libvirt/schemas/storagepool.rng
|
||||
%{_datadir}/libvirt/schemas/storagevol.rng
|
||||
|
||||
|
|
|
|||
|
|
@ -211,8 +211,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
|
|||
%{mingw32_datadir}/libvirt/schemas/nodedev.rng
|
||||
%{mingw32_datadir}/libvirt/schemas/nwfilter.rng
|
||||
%{mingw32_datadir}/libvirt/schemas/secret.rng
|
||||
%{mingw32_datadir}/libvirt/schemas/storageencryption.rng
|
||||
%{mingw32_datadir}/libvirt/schemas/storagefilefeatures.rng
|
||||
%{mingw32_datadir}/libvirt/schemas/storagecommon.rng
|
||||
%{mingw32_datadir}/libvirt/schemas/storagepool.rng
|
||||
%{mingw32_datadir}/libvirt/schemas/storagevol.rng
|
||||
%dir %{mingw32_datadir}/libvirt/api/
|
||||
|
|
@ -272,8 +271,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
|
|||
%{mingw64_datadir}/libvirt/schemas/nodedev.rng
|
||||
%{mingw64_datadir}/libvirt/schemas/nwfilter.rng
|
||||
%{mingw64_datadir}/libvirt/schemas/secret.rng
|
||||
%{mingw64_datadir}/libvirt/schemas/storageencryption.rng
|
||||
%{mingw64_datadir}/libvirt/schemas/storagefilefeatures.rng
|
||||
%{mingw64_datadir}/libvirt/schemas/storagecommon.rng
|
||||
%{mingw64_datadir}/libvirt/schemas/storagepool.rng
|
||||
%{mingw64_datadir}/libvirt/schemas/storagevol.rng
|
||||
%dir %{mingw64_datadir}/libvirt/api/
|
||||
|
|
|
|||
Loading…
Reference in New Issue