Add new net filesystem glusterfs

* src/storage_conf.c src/storage_conf.h: adds glusterfs to the list
  of network storage
* libvirt.spec.in: adds the dependency on glusterfs-client

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 857221e8826f20b55cdd29fc8128b2ff9b822de2..6321eaa35d84348ca0cb948074222d6b35232e24 100644 (file)
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -94,6 +94,8 @@ BuildRequires: util-linux
 # For showmount in FS driver (netfs discovery)
 BuildRequires: nfs-utils
 Requires: nfs-utils
+# For glusterfs
+Requires: glusterfs-client >= 2.0.2
 %endif
 %if %{with_qemu}
 # From QEMU RPMs

diff --git a/src/storage_conf.c b/src/storage_conf.c
index f5d9b6ce72157e3a6aa6eb9840d2b8fee3508425..fe1dc902889f1e417eacff7c0118ca20b2c5b509 100644 (file)
--- a/src/storage_conf.c
+++ b/src/storage_conf.c
@@ -68,7 +68,7 @@ VIR_ENUM_IMPL(virStoragePoolFormatFileSystem,
 
 VIR_ENUM_IMPL(virStoragePoolFormatFileSystemNet,
               VIR_STORAGE_POOL_NETFS_LAST,
-              "auto", "nfs")
+              "auto", "nfs", "glusterfs")
 
 VIR_ENUM_IMPL(virStoragePoolFormatDisk,
               VIR_STORAGE_POOL_DISK_LAST,

diff --git a/src/storage_conf.h b/src/storage_conf.h
index 61d3841007bb943e5405b3d2aba302b8e043b6e5..a6c3650bd9512964a4984bc6e7bddc3944b45af6 100644 (file)
--- a/src/storage_conf.h
+++ b/src/storage_conf.h
@@ -178,7 +178,6 @@ struct _virStoragePoolSourceDeviceExtent {
     int type;  /* free space type */
 };
 
-
 /*
  * Pools can be backed by one or more devices, and some
  * allow us to track free space on underlying devices.
@@ -399,6 +398,7 @@ VIR_ENUM_DECL(virStoragePoolFormatFileSystem)
 enum virStoragePoolFormatFileSystemNet {
     VIR_STORAGE_POOL_NETFS_AUTO = 0,
     VIR_STORAGE_POOL_NETFS_NFS,
+    VIR_STORAGE_POOL_NETFS_GLUSTERFS,
     VIR_STORAGE_POOL_NETFS_LAST,
 };
 VIR_ENUM_DECL(virStoragePoolFormatFileSystemNet)