[PATCH 04/11] qemuBlockStorageSourceGetRBDProps: Simplify handling of encryption format
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(a)redhat.com>
---
src/qemu/qemu_block.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 3d961c8b39..60e03d418e 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -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,
--
2.35.1