External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuBlockStorageSourceGetRBDProps: Simplify handling of encryption format

Browse Source 
Remove the impossible error message about the 'qcow2' encryption format
not being supported. We validated before that it can't happen.

Additionally the code can be simplified by removing error handling from
impossible code paths as the last resort is virJSONValueCreate not
allowing NULL argument with the 's:' modifier.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-04-22 16:16:18 +02:00
parent 487f15b26a
commit b1f5f14a5c
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_block.c
View File

@ -882,7 +882,7 @@ qemuBlockStorageSourceGetRBDProps(virStorageSource *src,
g_autoptr(virJSONValue) servers = NULL;
virJSONValue *ret = NULL;
g_autoptr(virJSONValue) encrypt = NULL;
const char *encformat;
const char *encformat = NULL;
const char *username = NULL;
g_autoptr(virJSONValue) authmodes = NULL;
const char *keysecret = NULL;
@ -911,16 +911,10 @@ qemuBlockStorageSourceGetRBDProps(virStorageSource *src,
break;
case VIR_STORAGE_ENCRYPTION_FORMAT_QCOW:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("librbd encryption engine only supports luks/luks2 formats"));
return NULL;
case VIR_STORAGE_ENCRYPTION_FORMAT_DEFAULT:
case VIR_STORAGE_ENCRYPTION_FORMAT_LAST:
default:
virReportEnumRangeError(virStorageEncryptionFormatType,
src->encryption->format);
return NULL;
break;
}
if (virJSONValueObjectAdd(&encrypt,