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 d7c17db6692164f4e47d34f169fe8cf29b9474f0..0472be5753bc4ecfd096e5b17dbf6b8d85c4ab23 100644 (file)
--- 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 e1d6a9e27d1e02221c6ff30cf670a0947de62706..d6e920bb8101c07d0c4ccb1c9e7709b51bb61903 100644 (file)
--- 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>