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

qemu: migration: Unlock vm on failed ACL check in protocol v2 APIs

Browse Source 
Avoid leaving the domain locked on a failed ACL check in
qemuDomainMigratePerform() and qemuDomainMigrateFinish2().

Introduced in commit abf75aea24 (Add ACL checks into the QEMU driver).

(cherry picked from commit 2bdcd29c71)
This commit is contained in:
Peter Krempa 2014-12-08 19:25:21 +01:00 committed by Eric Blake
parent 643b7aa8e7
commit 995516ad3d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_driver.c
View File

@ -10104,8 +10104,10 @@ qemuDomainMigratePerform(virDomainPtr dom,
if (!(vm = qemuDomObjFromDomain(dom))) if (!(vm = qemuDomObjFromDomain(dom)))
goto cleanup; goto cleanup;
if (virDomainMigratePerformEnsureACL(dom->conn, vm->def) < 0) if (virDomainMigratePerformEnsureACL(dom->conn, vm->def) < 0) {
virObjectUnlock(vm);
goto cleanup; goto cleanup;
}
if (flags & VIR_MIGRATE_PEER2PEER) { if (flags & VIR_MIGRATE_PEER2PEER) {
dconnuri = uri; dconnuri = uri;
@ -10152,8 +10154,10 @@ qemuDomainMigrateFinish2(virConnectPtr dconn,
goto cleanup; goto cleanup;
} }
if (virDomainMigrateFinish2EnsureACL(dconn, vm->def) < 0) if (virDomainMigrateFinish2EnsureACL(dconn, vm->def) < 0) {
virObjectUnlock(vm);
goto cleanup; goto cleanup;
}
/* Do not use cookies in v2 protocol, since the cookie /* Do not use cookies in v2 protocol, since the cookie
* length was not sufficiently large, causing failures * length was not sufficiently large, causing failures