[libvirt] [PATCH v2 07/12] storage: add vmfs filesystem type
It will be used to represent the type of a filesystem pool in ESXi.
Signed-off-by: Pino Toscano <ptoscano(a)redhat.com>
---
docs/schemas/storagepool.rng | 1 +
docs/schemas/storagevol.rng | 1 +
docs/storage.html.in | 3 +++
src/conf/storage_conf.c | 1 +
src/conf/storage_conf.h | 1 +
tests/storagepoolcapsschemadata/poolcaps-fs.xml | 1 +
tests/storagepoolcapsschemadata/poolcaps-full.xml | 1 +
7 files changed, 9 insertions(+)
diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng
index 976a02baeb..ff0d3c836c 100644
--- a/docs/schemas/storagepool.rng
+++ b/docs/schemas/storagepool.rng
@@ -451,6 +451,7 @@
<value>hfs+</value>
<value>xfs</value>
<value>ocfs2</value>
+ <value>vmfs</value>
</choice>
</attribute>
</element>
diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng
index 32aaa2784d..382cd121ad 100644
--- a/docs/schemas/storagevol.rng
+++ b/docs/schemas/storagevol.rng
@@ -194,6 +194,7 @@
<value>hfs+</value>
<value>xfs</value>
<value>ocfs2</value>
+ <value>vmfs</value>
</choice>
</define>
diff --git a/docs/storage.html.in b/docs/storage.html.in
index e0e4edec1e..72fa13944a 100644
--- a/docs/storage.html.in
+++ b/docs/storage.html.in
@@ -202,6 +202,9 @@
<li>
<code>ocfs2</code>
</li>
+ <li>
+ <code>vmfs</code>
+ </li>
</ul>
<h3>Valid volume format types</h3>
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index fd640bfa2b..252d28cbfb 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -67,6 +67,7 @@ VIR_ENUM_IMPL(virStoragePoolFormatFileSystem,
"auto", "ext2", "ext3",
"ext4", "ufs", "iso9660", "udf",
"gfs", "gfs2", "vfat", "hfs+",
"xfs", "ocfs2",
+ "vmfs",
);
VIR_ENUM_IMPL(virStoragePoolFormatFileSystemNet,
diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index d2600efff0..c0baeffc1c 100644
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -362,6 +362,7 @@ typedef enum {
VIR_STORAGE_POOL_FS_HFSPLUS,
VIR_STORAGE_POOL_FS_XFS,
VIR_STORAGE_POOL_FS_OCFS2,
+ VIR_STORAGE_POOL_FS_VMFS,
VIR_STORAGE_POOL_FS_LAST,
} virStoragePoolFormatFileSystem;
VIR_ENUM_DECL(virStoragePoolFormatFileSystem);
diff --git a/tests/storagepoolcapsschemadata/poolcaps-fs.xml
b/tests/storagepoolcapsschemadata/poolcaps-fs.xml
index 182fa398f5..eee75af746 100644
--- a/tests/storagepoolcapsschemadata/poolcaps-fs.xml
+++ b/tests/storagepoolcapsschemadata/poolcaps-fs.xml
@@ -40,6 +40,7 @@
<value>hfs+</value>
<value>xfs</value>
<value>ocfs2</value>
+ <value>vmfs</value>
</enum>
</poolOptions>
<volOptions>
diff --git a/tests/storagepoolcapsschemadata/poolcaps-full.xml
b/tests/storagepoolcapsschemadata/poolcaps-full.xml
index 980c6d210e..805950a937 100644
--- a/tests/storagepoolcapsschemadata/poolcaps-full.xml
+++ b/tests/storagepoolcapsschemadata/poolcaps-full.xml
@@ -40,6 +40,7 @@
<value>hfs+</value>
<value>xfs</value>
<value>ocfs2</value>
+ <value>vmfs</value>
</enum>
</poolOptions>
<volOptions>
--
2.21.0