From a0208e6635a0e02f1ffc7391377d93b4dc20c99f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 17 Sep 2008 16:07:03 +0000
Subject: [PATCH] src/openvz_driver.c: Fix segfault in OpenVZ driver (Evgeniy
 Sokolov).

---
 ChangeLog           |  5 +++++
 src/openvz_driver.c | 11 ++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fd319089af..5ac49101e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 17 17:02:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
+
+	* src/openvz_driver.c: Fix segfault in OpenVZ driver
+	  (Evgeniy Sokolov).
+
 Wed Sep 17 16:38:00 BST 2008 Daniel P berrange <berrange@redhat.com>
 
 	* tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml,
diff --git a/src/openvz_driver.c b/src/openvz_driver.c
index bd4f965d93..f68841ee16 100644
--- a/src/openvz_driver.c
+++ b/src/openvz_driver.c
@@ -436,9 +436,10 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml)
 
     vm = virDomainFindByName(driver->domains, vmdef->name);
     if (vm) {
-        virDomainDefFree(vmdef);
-        openvzLog(OPENVZ_ERR, _("Already an OPENVZ VM active with the id '%s'"),
+        openvzError(conn, VIR_ERR_OPERATION_FAILED,
+                  _("Already an OPENVZ VM active with the id '%s'"),
                   vmdef->name);
+        virDomainDefFree(vmdef);
         return NULL;
     }
     if (!(vm = virDomainAssignDef(conn, &driver->domains, vmdef))) {
@@ -512,10 +513,10 @@ openvzDomainCreateLinux(virConnectPtr conn, const char *xml,
 
     vm = virDomainFindByName(driver->domains, vmdef->name);
     if (vm) {
+        openvzError(conn, VIR_ERR_OPERATION_FAILED,
+                  _("Already an OPENVZ VM defined with the id '%s'"),
+                  vmdef->name);
         virDomainDefFree(vmdef);
-        openvzLog(OPENVZ_ERR,
-                  _("Already an OPENVZ VM defined with the id '%d'"),
-                strtoI(vmdef->name));
         return NULL;
     }
     if (!(vm = virDomainAssignDef(conn, &driver->domains, vmdef))) {