[libvirt] [PATCH v2 01/17] conf: Remove volOptions for VIR_STORAGE_POOL_SHEEPDOG

[John Ferlan]

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 at redhat.com>
---
 src/conf/storage_conf.c                     | 4 ----
 tests/storagevolxml2xmlout/vol-sheepdog.xml | 1 -
 2 files changed, 5 deletions(-)

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index a2ddecf0f2..703093d3b5 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>
-- 
2.20.1