On 01/18/2013 08:45 AM, Viktor Mihajlovski wrote:
This should have been commit 56fd513 already, but was missed by initially. The driver unlock call in the cleanup section of
s/by //
DomainManagedSave does actually belong to DomainSendKey.
Please also call out commit 8c5d2ba as the source of the original problem.
Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c28c223..853e35d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2434,6 +2434,7 @@ endjob: cleanup: if (vm) virObjectUnlock(vm); + qemuDriverUnlock(driver); return ret;
This is part of qemuDomainSendKey, and undoes the mistake in 8c5d2ba; good.
}
@@ -3174,7 +3175,6 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) cleanup: if (vm) virObjectUnlock(vm); - qemuDriverUnlock(driver); VIR_FREE(name);
This is in qemuDomainManagedSave, which was not mentioned in the commit message of 8c5d2ba, was not touched in 56fd513, but does fix a bug (unlocking without owning the lock). Now I have to go dig which commit introduced _this_ problem... Found it - commit 2745177 was the culprit here. Yuck. You _still_ haven't fixed DomainHasManagedSaveImage (which 8c5d2ba claimed to fix), and we've found yet another bogus commit. We need a v2 of this patch that scrubs ALL of the bugs at once. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org