[libvirt] [PATCH 1/4] doc/schema: add ocfs2 to storage pool
Add ocfs2 for disk pool. Signed-off-by: Philipp Hahn <hahn@univention.de> --- docs/schemas/storagevol.rng | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index ba95c55..765c5a5 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -179,11 +179,10 @@ <value>vfat</value> <value>hfs+</value> <value>xfs</value> + <value>ocfs2</value> </choice> - </define> - <define name='formatfile'> <choice> <value>unknown</value> -- 1.7.10.4
iSCSO qualified names (iqn) from RFC3721 may contain colons (':'), which neither matches the absFilePath nor genericName: $ virsh pool-dumpxml myiscsipool <pool type='iscsi'> ... <source> ... <device path='iqn.2003-01.org.linux-iscsi.phahn-sid93.x8664:sn.8a3daa0d4efd'/> </source> ... </pool> Add IscsiQualifiedName type and allow its use in sourceiscsi. Signed-off-by: Philipp Hahn <hahn@univention.de> --- docs/schemas/storagepool.rng | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 2b1f08d..0cc0406 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -231,6 +231,7 @@ <choice> <ref name='absFilePath'/> <ref name='genericName'/> + <ref name='IscsiQualifiedName'/> </choice> </attribute> <choice> @@ -492,7 +493,6 @@ <optional> <ref name='sourceinfovendor'/> </optional> - </element> </define> @@ -519,6 +519,12 @@ </element> </define> + <define name='IscsiQualifiedName'> + <data type='string'> + <param name="pattern">iqn\.[0-9]{4}-(0[1-9]|1[0-2])\.[a-zA-Z0-9\.\-]+(:.+)?</param> + </data> + </define> + <define name="PortNumber"> <data type="short"> <param name="minInclusive">-1</param> -- 1.7.10.4
On 2013年03月20日 18:45, Philipp Hahn wrote:
iSCSO qualified names (iqn) from RFC3721 may contain colons (':'), which neither matches the absFilePath nor genericName:
$ virsh pool-dumpxml myiscsipool <pool type='iscsi'> ... <source> ... <device path='iqn.2003-01.org.linux-iscsi.phahn-sid93.x8664:sn.8a3daa0d4efd'/> </source> ... </pool>
Add IscsiQualifiedName type and allow its use in sourceiscsi.
Signed-off-by: Philipp Hahn<hahn@univention.de> --- docs/schemas/storagepool.rng | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 2b1f08d..0cc0406 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -231,6 +231,7 @@ <choice> <ref name='absFilePath'/> <ref name='genericName'/> +<ref name='IscsiQualifiedName'/> </choice> </attribute> <choice> @@ -492,7 +493,6 @@ <optional> <ref name='sourceinfovendor'/> </optional> - </element> </define>
@@ -519,6 +519,12 @@ </element> </define>
+<define name='IscsiQualifiedName'> +<data type='string'> +<param name="pattern">iqn\.[0-9]{4}-(0[1-9]|1[0-2])\.[a-zA-Z0-9\.\-]+(:.+)?</param> +</data> +</define> + <define name="PortNumber"> <data type="short"> <param name="minInclusive">-1</param>
ACK.
On 2013年03月20日 21:38, Osier Yang wrote:
On 2013年03月20日 18:45, Philipp Hahn wrote:
iSCSO qualified names (iqn) from RFC3721 may contain colons (':'), which
With s/iSCSO/iSCSI/,
neither matches the absFilePath nor genericName:
$ virsh pool-dumpxml myiscsipool <pool type='iscsi'> ... <source> ... <device path='iqn.2003-01.org.linux-iscsi.phahn-sid93.x8664:sn.8a3daa0d4efd'/> </source> ... </pool>
Add IscsiQualifiedName type and allow its use in sourceiscsi.
Signed-off-by: Philipp Hahn<hahn@univention.de> --- docs/schemas/storagepool.rng | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 2b1f08d..0cc0406 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -231,6 +231,7 @@ <choice> <ref name='absFilePath'/> <ref name='genericName'/> +<ref name='IscsiQualifiedName'/> </choice> </attribute> <choice> @@ -492,7 +493,6 @@ <optional> <ref name='sourceinfovendor'/> </optional> - </element> </define>
@@ -519,6 +519,12 @@ </element> </define>
+<define name='IscsiQualifiedName'> +<data type='string'> +<param name="pattern">iqn\.[0-9]{4}-(0[1-9]|1[0-2])\.[a-zA-Z0-9\.\-]+(:.+)?</param>
+</data> +</define> + <define name="PortNumber"> <data type="short"> <param name="minInclusive">-1</param>
ACK.
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Remove 'are' before 'have'. Signed-off-by: Philipp Hahn <hahn@univention.de> --- docs/storage.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/storage.html.in b/docs/storage.html.in index 7712c80..3777474 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -335,7 +335,7 @@ <h2><a name="StorageBackendDisk">Disk volume pools</a></h2> <p> This provides a pool based on a physical disk. Volumes are created - by adding partitions to the disk. Disk pools are have constraints + by adding partitions to the disk. Disk pools have constraints on the size and placement of volumes. The 'free extents' information will detail the regions which are available for creating new volumes. A volume cannot span across 2 different free extents. -- 1.7.10.4
On 2013年03月20日 19:42, Philipp Hahn wrote:
Remove 'are' before 'have'.
Signed-off-by: Philipp Hahn<hahn@univention.de> --- docs/storage.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/storage.html.in b/docs/storage.html.in index 7712c80..3777474 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -335,7 +335,7 @@ <h2><a name="StorageBackendDisk">Disk volume pools</a></h2> <p> This provides a pool based on a physical disk. Volumes are created - by adding partitions to the disk. Disk pools are have constraints + by adding partitions to the disk. Disk pools have constraints on the size and placement of volumes. The 'free extents' information will detail the regions which are available for creating new volumes. A volume cannot span across 2 different free extents.
ACK.
The storage volume formats supported by the disk storage pool are missing from the allowed values. Add partition types. Signed-off-by: Philipp Hahn <hahn@univention.de> --- docs/schemas/storagevol.rng | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index 765c5a5..0bbb4d2 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -201,6 +201,19 @@ </choice> </define> + <define name='formatdisk'> + <choice> + <value>none</value> + <value>linux</value> + <value>fat16</value> + <value>fat32</value> + <value>linux-swap</value> + <value>linux-lvm</value> + <value>linux-raid</value> + <value>extended</value> + </choice> + </define> + <define name='format'> <optional> <element name='format'> @@ -208,6 +221,7 @@ <choice> <ref name='formatfile'/> <ref name='formatdev'/> + <ref name='formatdisk'/> </choice> </attribute> </element> -- 1.7.10.4
On 2013年03月20日 19:53, Philipp Hahn wrote:
The storage volume formats supported by the disk storage pool are missing from the allowed values.
Add partition types.
Signed-off-by: Philipp Hahn<hahn@univention.de> --- docs/schemas/storagevol.rng | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index 765c5a5..0bbb4d2 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -201,6 +201,19 @@ </choice> </define>
+<define name='formatdisk'> +<choice> +<value>none</value> +<value>linux</value> +<value>fat16</value> +<value>fat32</value> +<value>linux-swap</value> +<value>linux-lvm</value> +<value>linux-raid</value> +<value>extended</value> +</choice> +</define> + <define name='format'> <optional> <element name='format'> @@ -208,6 +221,7 @@ <choice> <ref name='formatfile'/> <ref name='formatdev'/> +<ref name='formatdisk'/> </choice> </attribute> </element>
ACK.
On 2013年02月26日 20:41, Philipp Hahn wrote:
Add ocfs2 for disk pool.
Actually it's for volume.
Signed-off-by: Philipp Hahn<hahn@univention.de> --- docs/schemas/storagevol.rng | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index ba95c55..765c5a5 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -179,11 +179,10 @@ <value>vfat</value> <value>hfs+</value> <value>xfs</value> +<value>ocfs2</value> </choice> - </define>
- <define name='formatfile'> <choice> <value>unknown</value>
ACK with the subject changed to "for disk vol". Applies to the commit log too.
On 2013年03月20日 21:31, Osier Yang wrote:
On 2013年02月26日 20:41, Philipp Hahn wrote:
Add ocfs2 for disk pool.
Actually it's for volume.
Signed-off-by: Philipp Hahn<hahn@univention.de> --- docs/schemas/storagevol.rng | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index ba95c55..765c5a5 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -179,11 +179,10 @@ <value>vfat</value> <value>hfs+</value> <value>xfs</value> +<value>ocfs2</value> </choice> - </define>
- <define name='formatfile'> <choice> <value>unknown</value>
ACK with the subject changed to "for disk vol". Applies to the commit log too.
Pushed the set with pointed out small problems fixed. Osier
participants (2)
-
Osier Yang -
Philipp Hahn