Fix test driver 'save' deadlock

diff --git a/ChangeLog b/ChangeLog
index a40fa1ba5f2ba5038c3760d210b68ed4b36d1d1f..b6fcd1344efe4329046123e108dd409cd4bd0836 100644 (file)
--- 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 b4d8486de433db35a2acff6ee630891a76c6e600..32292ebfcbf9d24d2faa1b6fd66910e5a613fafe 100644 (file)
--- 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"),