From 8f762e34f32d3e4f609eae81e029c21953feee73 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Thu, 28 Aug 2008 11:59:07 +0000
Subject: [PATCH] Fix lookup of xen VM after define (Cole Robinson)

---
 ChangeLog           | 5 +++++
 src/xend_internal.c | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 22830b756f..89d3ddd227 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 28 12:58:15 BST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/xend_internal.c: Fix lookup of Xen VMs after define
+	(patch from Cole Robinson)
+
 Thu Aug 28 11:08:15 CEST 2008 Jim Meyering <meyering@redhat.com>
 
 	improve parallel build support
diff --git a/src/xend_internal.c b/src/xend_internal.c
index 2a687c3d4c..124ee8b5fc 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -4270,7 +4270,6 @@ xenDaemonDomainMigratePerform (virDomainPtr domain,
 virDomainPtr xenDaemonDomainDefineXML(virConnectPtr conn, const char *xmlDesc) {
     int ret;
     char *sexpr;
-    char *name = NULL;
     virDomainPtr dom;
     xenUnifiedPrivatePtr priv;
     virDomainDefPtr def;
@@ -4292,15 +4291,17 @@ virDomainPtr xenDaemonDomainDefineXML(virConnectPtr conn, const char *xmlDesc) {
         goto error;
     }
 
+    DEBUG("Defining w/ sexpr: \n%s", sexpr);
+
     ret = xend_op(conn, "", "op", "new", "config", sexpr, NULL);
     VIR_FREE(sexpr);
     if (ret != 0) {
         virXendError(conn, VIR_ERR_XEN_CALL,
-                     _("Failed to create inactive domain %s\n"), name);
+                     _("Failed to create inactive domain %s\n"), def->name);
         goto error;
     }
 
-    dom = virDomainLookupByName(conn, name);
+    dom = virDomainLookupByName(conn, def->name);
     if (dom == NULL) {
         goto error;
     }