From c1b2aea80cde769456fdb211b3fb133b423c8f08 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 22 Jun 2009 16:29:40 +0000
Subject: [PATCH] test driver: Fix domain ID after redefining a running VM

The ID of the existing VM was being unconditionally set to -1, which was
upsetting virt-manager.
---
 ChangeLog  | 4 ++++
 src/test.c | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4c77baa1b9..aeeb1bac1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun 22 11:09:18 EDT 2009 Cole Robinson <crobinso@redhat.com>
+
+	* src/test.c: Fix domain ID after redefining a running VM
+
 Mon Jun 22 12:27:39 CEST 2009 Daniel Veillard <veillard@redhat.com>
 
 	* src/conf.[ch]: restrict VMX syntax parsing types, patch by Matthias
diff --git a/src/test.c b/src/test.c
index 7dc0840e61..2a672a3f69 100644
--- a/src/test.c
+++ b/src/test.c
@@ -1623,16 +1623,16 @@ static virDomainPtr testDomainDefineXML(virConnectPtr conn,
                                   def)) == NULL) {
         goto cleanup;
     }
+    def = NULL;
     dom->persistent = 1;
-    dom->def->id = -1;
+
     event = virDomainEventNewFromObj(dom,
                                      VIR_DOMAIN_EVENT_DEFINED,
                                      VIR_DOMAIN_EVENT_DEFINED_ADDED);
 
-    ret = virGetDomain(conn, def->name, def->uuid);
-    def = NULL;
+    ret = virGetDomain(conn, dom->def->name, dom->def->uuid);
     if (ret)
-        ret->id = -1;
+        ret->id = dom->def->id;
 
 cleanup:
     virDomainDefFree(def);