Merge error?
I'll commit this in an hour or so.
From e660e3353b468cb219208a1aba9f8eca456467dd Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Thu, 22 Jan 2009 20:08:55 +0100
Subject: [PATCH] xm_internal.c: fix locking bug: s/Unlock/Lock/
* src/xm_internal.c (xenXMDomainDefineXML): Release lock, (don't
try to acquire it) upon failure, just before returning.
---
src/xm_internal.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/xm_internal.c b/src/xm_internal.c
index 31f56b7..b420e80 100644
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -2357,7 +2357,7 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char
*xml) {
if (!(def = virDomainDefParseString(conn, priv->caps, xml,
VIR_DOMAIN_XML_INACTIVE))) {
- xenUnifiedLock(priv);
+ xenUnifiedUnlock(priv);
return (NULL);
}
--
1.6.1.399.g0d272