External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-20 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "conf: Remove volOptions for VIR_STORAGE_POOL_RBD"

Browse Source 
This reverts commit 035db37394ad11a39d47f8bd2b6a8a2734283cbf

Even though we only allow using RBD with raw volumes,
removing the options and the default format causes our
parser not to fill out the volume format and the backend code
rejects creating a non-raw volume.

Re-introduce the volume options to fix volume creation while
erroring out on requests to use non-raw formats.

https://bugzilla.redhat.com/show_bug.cgi?id=1724065

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Ján Tomko 2019-07-12 16:13:17 +02:00
parent 9b7c4048fa
commit 5d74619329
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/conf/storage_conf.c
View File

@ -241,6 +241,11 @@ static virStoragePoolTypeInfo poolTypeInfo[] = {
VIR_STORAGE_POOL_SOURCE_NETWORK | VIR_STORAGE_POOL_SOURCE_NETWORK |
VIR_STORAGE_POOL_SOURCE_NAME), VIR_STORAGE_POOL_SOURCE_NAME),
}, },
.volOptions = {
.defaultFormat = VIR_STORAGE_FILE_RAW,
.formatFromString = virStorageVolumeFormatFromString,
.formatToString = virStorageFileFormatTypeToString,
}
}, },
{.poolType = VIR_STORAGE_POOL_SHEEPDOG, {.poolType = VIR_STORAGE_POOL_SHEEPDOG,
.poolOptions = { .poolOptions = {

5
tests/storagepoolcapsschemadata/poolcaps-fs.xml
View File

@ -145,6 +145,11 @@
<pool type='mpath' supported='no'> <pool type='mpath' supported='no'>
</pool> </pool>
<pool type='rbd' supported='no'> <pool type='rbd' supported='no'>
<volOptions>
<defaultFormat type='raw'/>
<enum name='targetFormatType'>
</enum>
</volOptions>
</pool> </pool>
<pool type='sheepdog' supported='no'> <pool type='sheepdog' supported='no'>
</pool> </pool>

5
tests/storagepoolcapsschemadata/poolcaps-full.xml
View File

@ -145,6 +145,11 @@
<pool type='mpath' supported='yes'> <pool type='mpath' supported='yes'>
</pool> </pool>
<pool type='rbd' supported='yes'> <pool type='rbd' supported='yes'>
<volOptions>
<defaultFormat type='raw'/>
<enum name='targetFormatType'>
</enum>
</volOptions>
</pool> </pool>
<pool type='sheepdog' supported='yes'> <pool type='sheepdog' supported='yes'>
</pool> </pool>