Add ocfs2 to list of fs pool types

* src/conf/storage_conf.c src/conf/storage_conf.h: extend the enums
  and values
* docs/schemas/storagepool.rng: add to the list of storage pool type
  formats

diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng
index 7ab01871531b2e185375f88ada6c96530c7d5ed6..249bf9cf2ef8ec09143faf56b216b04001646ca1 100644 (file)
--- a/docs/schemas/storagepool.rng
+++ b/docs/schemas/storagepool.rng
@@ -258,6 +258,7 @@
            <value>vfat</value>
            <value>hfs+</value>
            <value>xfs</value>
+           <value>ocfs2</value>
          </choice>
        </attribute>
       </element>

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 1633aac240d6cc6a41d115dbabce62aab4176138..c975b65326f779ff45a16943e28c2ec8d18deade 100644 (file)
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -60,7 +60,7 @@ VIR_ENUM_IMPL(virStoragePoolFormatFileSystem,
               VIR_STORAGE_POOL_FS_LAST,
               "auto", "ext2", "ext3",
               "ext4", "ufs", "iso9660", "udf",
-              "gfs", "gfs2", "vfat", "hfs+", "xfs")
+              "gfs", "gfs2", "vfat", "hfs+", "xfs", "ocfs2")
 
 VIR_ENUM_IMPL(virStoragePoolFormatFileSystemNet,
               VIR_STORAGE_POOL_NETFS_LAST,

diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index 9fedb12671a217d3516fe6e789ce8ffb2fa823fe..a22ac5e19f9ac1b461fd63db0ac52fa26a84e3d2 100644 (file)
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -395,6 +395,7 @@ enum virStoragePoolFormatFileSystem {
     VIR_STORAGE_POOL_FS_VFAT,
     VIR_STORAGE_POOL_FS_HFSPLUS,
     VIR_STORAGE_POOL_FS_XFS,
+    VIR_STORAGE_POOL_FS_OCFS2,
     VIR_STORAGE_POOL_FS_LAST,
 };
 VIR_ENUM_DECL(virStoragePoolFormatFileSystem)