[libvirt] [PATCH 2/7] qemuDomainValidateStorageSource: Relax PR validation
Actually, it is not always bug if path is provided. For instance,
on domain migration the migration XML contains the path even for
managed reservations. Accept this and teach our prepare code to
not leak in this case.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/qemu/qemu_domain.c | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index a60bca29ca..706ee9be46 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4615,19 +4615,11 @@ qemuDomainValidateStorageSource(virStorageSourcePtr src,
}
}
- if (src->pr) {
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PR_MANAGER_HELPER)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("reservations not supported with this QEMU
binary"));
- return -1;
- }
-
- if (virStoragePRDefIsManaged(src->pr) && src->pr->path) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("'path' attribute should not be provided for
"
- "managed reservations"));
- return -1;
- }
+ if (src->pr &&
+ !virQEMUCapsGet(qemuCaps, QEMU_CAPS_PR_MANAGER_HELPER)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("reservations not supported with this QEMU binary"));
+ return -1;
}
return 0;
@@ -12852,7 +12844,10 @@ qemuDomainPrepareStorageSourcePR(virStorageSourcePtr src,
if (!src->pr)
return 0;
+ VIR_FREE(src->pr->mgralias);
+
if (virStoragePRDefIsManaged(src->pr)) {
+ VIR_FREE(src->pr->path);
if (!(src->pr->path = qemuDomainGetManagedPRSocketPath(priv)))
return -1;
if (VIR_STRDUP(src->pr->mgralias, qemuDomainGetManagedPRAlias()) < 0)
--
2.16.4