Fix test driver 'save' deadlock

This commit is contained in:
Cole Robinson 2009-03-16 17:14:34 +00:00
parent b44af714d3
commit d2c77e06c7
2 changed files with 8 additions and 3 deletions

View File

@ -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> Mon Mar 16 13:52:00 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
Support SASL auth for VNC server. Support SASL auth for VNC server.

View File

@ -1172,8 +1172,6 @@ cleanup:
return ret; return ret;
} }
static char *testDomainDumpXML(virDomainPtr domain, int flags);
#define TEST_SAVE_MAGIC "TestGuestMagic" #define TEST_SAVE_MAGIC "TestGuestMagic"
static int testDomainSave(virDomainPtr domain, static int testDomainSave(virDomainPtr domain,
@ -1196,7 +1194,10 @@ static int testDomainSave(virDomainPtr domain,
goto cleanup; goto cleanup;
} }
xml = testDomainDumpXML(domain, 0); xml = virDomainDefFormat(domain->conn,
privdom->def,
VIR_DOMAIN_XML_SECURE);
if (xml == NULL) { if (xml == NULL) {
virReportSystemError(domain->conn, errno, virReportSystemError(domain->conn, errno,
_("saving domain '%s' failed to allocate space for metadata"), _("saving domain '%s' failed to allocate space for metadata"),