From: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: Sun, 27 Mar 2016 15:07:52 +0000 (-0400)
Subject: Revert "zfs: Only raw volumes are supported"
X-Git-Tag: v1.3.3-rc1~46
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b77cec09db67aff75313b53c931ad15c1aba27bd;p=thirdparty%2Flibvirt.git

Revert "zfs: Only raw volumes are supported"

This reverts commit bb5f2dc91f43f48ff726aa589bdac546738d2980.

The "if (vol->target.format != VIR_STORAGE_FILE_RAW)" check in the
createVol backend. This check is bogus because virStorageVolDefParseXML()
in conf/storage_conf.c sets target.format only if volOptions in
virStoragePoolTypeInfo has formatFromString set, and that's not the
case the zfs backend.

So the check always fails and breaks volume creation.
---

diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c
index 5238ecc84e..c66a808ab7 100644
--- a/src/storage/storage_backend_zfs.c
+++ b/src/storage/storage_backend_zfs.c
@@ -301,12 +301,6 @@ virStorageBackendZFSCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED,
     int ret = -1;
     int volmode_needed = -1;
 
-    if (vol->target.format != VIR_STORAGE_FILE_RAW) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("only RAW volumes are supported by this storage pool"));
-        return -1;
-    }
-
     if (vol->target.encryption != NULL) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        "%s", _("storage pool does not support encrypted "