From: John Ferlan <jferlan@redhat.com>
Date: Wed, 6 Feb 2019 21:57:28 +0000 (-0500)
Subject: conf: Remove volOptions for VIR_STORAGE_POOL_SHEEPDOG
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4ad00278f64c9b9c6f95accbfaaebef0575e4b1e;p=libvirt.git

conf: Remove volOptions for VIR_STORAGE_POOL_SHEEPDOG

The sheepdog pool is documented as not using the volume type,
so let's just remove it.  Besides it would have produced bad
results since the defaultType is FILE but the formatting used
the Disk types.

Signed-off-by: John Ferlan <jferlan@redhat.com>
ACKed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index d7c17db669..0472be5753 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -249,10 +249,6 @@ static virStoragePoolTypeInfo poolTypeInfo[] = {
                    VIR_STORAGE_POOL_SOURCE_NETWORK |
                    VIR_STORAGE_POOL_SOURCE_NAME),
      },
-     .volOptions = {
-         .defaultFormat = VIR_STORAGE_FILE_RAW,
-         .formatToString = virStoragePoolFormatDiskTypeToString,
-     }
     },
     {.poolType = VIR_STORAGE_POOL_GLUSTER,
      .poolOptions = {
diff --git a/tests/storagevolxml2xmlout/vol-sheepdog.xml b/tests/storagevolxml2xmlout/vol-sheepdog.xml
index e1d6a9e27d..d6e920bb81 100644
--- a/tests/storagevolxml2xmlout/vol-sheepdog.xml
+++ b/tests/storagevolxml2xmlout/vol-sheepdog.xml
@@ -6,6 +6,5 @@
   <allocation unit='bytes'>0</allocation>
   <target>
     <path>sheepdog:test2</path>
-    <format type='unknown'/>
   </target>
 </volume>