From d2c77e06c7789185b481f527c0155db1595583f7 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 16 Mar 2009 17:14:34 +0000
Subject: [PATCH] Fix test driver 'save' deadlock

---
 ChangeLog  | 4 ++++
 src/test.c | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a40fa1ba5f..b6fcd1344e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar 16 13:12:59 EDT 2009 Cole Robinson <crobinso@redhat.com>
+
+	* src/test.c: Fix test driver 'save' deadlock
+
 Mon Mar 16 13:52:00 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
 
 	Support SASL auth for VNC server.
diff --git a/src/test.c b/src/test.c
index b4d8486de4..32292ebfcb 100644
--- a/src/test.c
+++ b/src/test.c
@@ -1172,8 +1172,6 @@ cleanup:
     return ret;
 }
 
-static char *testDomainDumpXML(virDomainPtr domain, int flags);
-
 #define TEST_SAVE_MAGIC "TestGuestMagic"
 
 static int testDomainSave(virDomainPtr domain,
@@ -1196,7 +1194,10 @@ static int testDomainSave(virDomainPtr domain,
         goto cleanup;
     }
 
-    xml = testDomainDumpXML(domain, 0);
+    xml = virDomainDefFormat(domain->conn,
+                             privdom->def,
+                             VIR_DOMAIN_XML_SECURE);
+
     if (xml == NULL) {
         virReportSystemError(domain->conn, errno,
                              _("saving domain '%s' failed to allocate space for metadata"),