NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

conf: domain: Split out source validation part from virDomainDiskDefParseValidate

Browse Source 
Separate the validation of the source so that it can be reused once we
split up the XML parser too.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2021-04-15 15:20:28 +02:00
parent dbfb5aa7c0
commit c4dfe41c31
1 changed files with 46 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/conf/domain_conf.c
View File

@ -9045,29 +9045,55 @@ virDomainDiskDefGeometryParse(virDomainDiskDef *def,
static int static int
virDomainDiskSourceDefParseAuthValidate(const virStorageSource *src) virDomainDiskDefParseValidateSourceChainOne(const virStorageSource *src)
{ {
virStorageAuthDef *authdef = src->auth; if (src->type == VIR_STORAGE_TYPE_NETWORK && src->auth) {
int actUsage; virStorageAuthDef *authdef = src->auth;
int actUsage;
if (src->type != VIR_STORAGE_TYPE_NETWORK || !authdef) if ((actUsage = virSecretUsageTypeFromString(authdef->secrettype)) < 0) {
return 0; virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown secret type '%s'"),
NULLSTR(authdef->secrettype));
return -1;
}
if ((actUsage = virSecretUsageTypeFromString(authdef->secrettype)) < 0) { if ((src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI &&
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, actUsage != VIR_SECRET_USAGE_TYPE_ISCSI) ||
_("unknown secret type '%s'"), (src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD &&
NULLSTR(authdef->secrettype)); actUsage != VIR_SECRET_USAGE_TYPE_CEPH)) {
return -1; virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("invalid secret type '%s'"),
virSecretUsageTypeToString(actUsage));
return -1;
}
} }
if ((src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI && if (src->encryption) {
actUsage != VIR_SECRET_USAGE_TYPE_ISCSI) || virStorageEncryption *encryption = src->encryption;
(src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD &&
actUsage != VIR_SECRET_USAGE_TYPE_CEPH)) { if (encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS &&
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, encryption->encinfo.cipher_name) {
_("invalid secret type '%s'"),
virSecretUsageTypeToString(actUsage)); virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
return -1; _("supplying <cipher> for domain disk definition "
"is unnecessary"));
return -1;
}
}
return 0;
}
static int
virDomainDiskDefParseValidateSource(const virStorageSource *src)
{
const virStorageSource *next;
for (next = src; next; next = next->backingStore) {
if (virDomainDiskDefParseValidateSourceChainOne(next) < 0)
return -1;
} }
return 0; return 0;
@ -9078,7 +9104,8 @@ static int
virDomainDiskDefParseValidate(const virDomainDiskDef *def) virDomainDiskDefParseValidate(const virDomainDiskDef *def)
{ {
virStorageSource *next; if (virDomainDiskDefParseValidateSource(def->src) < 0)
return -1;
if (def->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) { if (def->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) {
if (def->event_idx != VIR_TRISTATE_SWITCH_ABSENT) { if (def->event_idx != VIR_TRISTATE_SWITCH_ABSENT) {
@ -9150,23 +9177,6 @@ virDomainDiskDefParseValidate(const virDomainDiskDef *def)
} }
} }
for (next = def->src; next; next = next->backingStore) {
if (virDomainDiskSourceDefParseAuthValidate(next) < 0)
return -1;
if (next->encryption) {
virStorageEncryption *encryption = next->encryption;
if (encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS &&
encryption->encinfo.cipher_name) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("supplying <cipher> for domain disk definition "
"is unnecessary"));
return -1;
}
}
}
return 0; return 0;
} }