openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

testError format strings: explicitly include domain and network names 

This repairs the "make check" failure of tests/undefine.
* src/test.c (testResumeDomain, testPauseDomain): Likewise.
(testShutdownDomain, testGetDomainInfo, ): Likewise.
(testSetMemory, testSetVcpus, testDomainCreate, testDomainUndefine)
(testDomainGetSchedulerType, testDomainGetSchedulerParams): Likewise.
(testDomainSetSchedulerParams, testNetworkUndefine): Likewise.
(testNetworkStart, testNetworkGetBridgeName): Likewise.
(testDomainCoreDump, testDomainSave): Likewise, and...
Name the file upon failed open or write.
Use strerror(errno) in diagnostics.
* tests/undefine: Adjust expected output.

test.c (testError): Remove now-ignored dom and net parameters.
This is a sytnax-only change: removing the two unused parameters
and updating all callers:
* src/test.c (GET_DOMAIN, GET_NETWORK, testError)
(testBuildCapabilities, testOpenDefault, testOpenFromFile)
(testOpen, testGetHostname, testGetURI, testGetCapabilities)
(testLookupDomainByID, testLookupDomainByUUID)
(testLookupDomainByName, testResumeDomain, testPauseDomain)
(testShutdownDomain, testGetDomainInfo, testDomainSave)
(testDomainRestore, testDomainCoreDump, testGetOSType)
(testSetMemory, testSetVcpus, testListDefinedDomains)
(testNodeGetCellsFreeMemory, testDomainCreate)
(testDomainUndefine, testDomainGetSchedulerType)
(testDomainGetSchedulerParams, testDomainSetSchedulerParams)
(testLookupNetworkByUUID, testLookupNetworkByName)
(testListNetworks, testListDefinedNetworks, testNetworkUndefine)
(testNetworkStart, testNetworkGetBridgeName): Update callers.
This commit is contained in:
Jim Meyering 2008-10-11 07:24:49 +00:00
parent 0c4a048485
commit 6ac274673c
3 changed files with 134 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ChangeLog
View File

@ -1,3 +1,36 @@
Sat Oct 11 09:23:18 CEST 2008 Jim Meyering <meyering@redhat.com>
testError format strings: explicitly include domain and network names
This repairs the "make check" failure of tests/undefine.
* src/test.c (testResumeDomain, testPauseDomain): Likewise.
(testShutdownDomain, testGetDomainInfo, ): Likewise.
(testSetMemory, testSetVcpus, testDomainCreate, testDomainUndefine)
(testDomainGetSchedulerType, testDomainGetSchedulerParams): Likewise.
(testDomainSetSchedulerParams, testNetworkUndefine): Likewise.
(testNetworkStart, testNetworkGetBridgeName): Likewise.
(testDomainCoreDump, testDomainSave): Likewise, and...
Name the file upon failed open or write.
Use strerror(errno) in diagnostics.
* tests/undefine: Adjust expected output.
test.c (testError): Remove now-ignored dom and net parameters.
This is a sytnax-only change: removing the two unused parameters
and updating all callers:
* src/test.c (GET_DOMAIN, GET_NETWORK, testError)
(testBuildCapabilities, testOpenDefault, testOpenFromFile)
(testOpen, testGetHostname, testGetURI, testGetCapabilities)
(testLookupDomainByID, testLookupDomainByUUID)
(testLookupDomainByName, testResumeDomain, testPauseDomain)
(testShutdownDomain, testGetDomainInfo, testDomainSave)
(testDomainRestore, testDomainCoreDump, testGetOSType)
(testSetMemory, testSetVcpus, testListDefinedDomains)
(testNodeGetCellsFreeMemory, testDomainCreate)
(testDomainUndefine, testDomainGetSchedulerType)
(testDomainGetSchedulerParams, testDomainSetSchedulerParams)
(testLookupNetworkByUUID, testLookupNetworkByName)
(testListNetworks, testListDefinedNetworks, testNetworkUndefine)
(testNetworkStart, testNetworkGetBridgeName): Update callers.
Fri Oct 10 19:16:00 BST 2008 Daniel P. Berrange <berrange@redhat.com> Fri Oct 10 19:16:00 BST 2008 Daniel P. Berrange <berrange@redhat.com>
* src/memory.c: If size*count== 0, then virRelloc must not * src/memory.c: If size*count== 0, then virRelloc must not

189
src/test.c
View File

@ -86,10 +86,9 @@ static const virNodeInfo defaultNodeInfo = {
\ \
privconn = (testConnPtr)dom->conn->privateData; \ privconn = (testConnPtr)dom->conn->privateData; \
do { \ do { \
if ((privdom = virDomainFindByName(&privconn->domains, \ if ((privdom = virDomainFindByName(&privconn->domains, \
(dom)->name)) == NULL) { \ (dom)->name)) == NULL) { \
testError((dom)->conn, (dom), NULL, VIR_ERR_INVALID_ARG, \ testError((dom)->conn, VIR_ERR_INVALID_ARG, __FUNCTION__); \
__FUNCTION__); \
return (ret); \ return (ret); \
} \ } \
} while (0) } while (0)
@ -102,8 +101,7 @@ static const virNodeInfo defaultNodeInfo = {
do { \ do { \
if ((privnet = virNetworkFindByName(&privconn->networks, \ if ((privnet = virNetworkFindByName(&privconn->networks, \
(net)->name)) == NULL) { \ (net)->name)) == NULL) { \
testError((net)->conn, NULL, (net), VIR_ERR_INVALID_ARG, \ testError((net)->conn, VIR_ERR_INVALID_ARG, __FUNCTION__); \
__FUNCTION__); \
return (ret); \ return (ret); \
} \ } \
} while (0) } while (0)
@ -114,8 +112,8 @@ static const virNodeInfo defaultNodeInfo = {
privconn = (testConnPtr)conn->privateData; privconn = (testConnPtr)conn->privateData;
#define testError(conn, dom, net, code, fmt...) \ #define testError(conn, code, fmt...) \
__virReportErrorHelper(conn, VIR_FROM_TEST, code, __FILE__, \ __virReportErrorHelper(conn, VIR_FROM_TEST, code, __FILE__, \
__FUNCTION__, __LINE__, fmt) __FUNCTION__, __LINE__, fmt)
static virCapsPtr static virCapsPtr
@ -168,7 +166,7 @@ testBuildCapabilities(virConnectPtr conn) {
return caps; return caps;
no_memory: no_memory:
testError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, NULL); testError(conn, VIR_ERR_NO_MEMORY, NULL);
virCapabilitiesFree(caps); virCapabilitiesFree(caps);
return NULL; return NULL;
} }
@ -209,13 +207,13 @@ static int testOpenDefault(virConnectPtr conn) {
virNetworkObjPtr netobj = NULL; virNetworkObjPtr netobj = NULL;
if (VIR_ALLOC(privconn) < 0) { if (VIR_ALLOC(privconn) < 0) {
testError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, "testConn"); testError(conn, VIR_ERR_NO_MEMORY, "testConn");
return VIR_DRV_OPEN_ERROR; return VIR_DRV_OPEN_ERROR;
} }
conn->privateData = privconn; conn->privateData = privconn;
if (gettimeofday(&tv, NULL) < 0) { if (gettimeofday(&tv, NULL) < 0) {
testError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("getting time of day")); testError(NULL, VIR_ERR_INTERNAL_ERROR, _("getting time of day"));
goto error; goto error;
} }
@ -304,7 +302,7 @@ static int testOpenFromFile(virConnectPtr conn,
virDomainObjPtr dom; virDomainObjPtr dom;
testConnPtr privconn; testConnPtr privconn;
if (VIR_ALLOC(privconn) < 0) { if (VIR_ALLOC(privconn) < 0) {
testError(NULL, NULL, NULL, VIR_ERR_NO_MEMORY, "testConn"); testError(NULL, VIR_ERR_NO_MEMORY, "testConn");
return VIR_DRV_OPEN_ERROR; return VIR_DRV_OPEN_ERROR;
} }
conn->privateData = privconn; conn->privateData = privconn;
@ -313,14 +311,14 @@ static int testOpenFromFile(virConnectPtr conn,
goto error; goto error;
if ((fd = open(file, O_RDONLY)) < 0) { if ((fd = open(file, O_RDONLY)) < 0) {
testError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("loading host definition file")); testError(NULL, VIR_ERR_INTERNAL_ERROR, _("loading host definition file"));
goto error; goto error;
} }
if (!(xml = xmlReadFd(fd, file, NULL, if (!(xml = xmlReadFd(fd, file, NULL,
XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOENT | XML_PARSE_NONET |
XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) {
testError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("host")); testError(NULL, VIR_ERR_INTERNAL_ERROR, _("host"));
goto error; goto error;
} }
close(fd); close(fd);
@ -328,13 +326,13 @@ static int testOpenFromFile(virConnectPtr conn,
root = xmlDocGetRootElement(xml); root = xmlDocGetRootElement(xml);
if ((root == NULL) || (!xmlStrEqual(root->name, BAD_CAST "node"))) { if ((root == NULL) || (!xmlStrEqual(root->name, BAD_CAST "node"))) {
testError(NULL, NULL, NULL, VIR_ERR_XML_ERROR, _("node")); testError(NULL, VIR_ERR_XML_ERROR, _("node"));
goto error; goto error;
} }
ctxt = xmlXPathNewContext(xml); ctxt = xmlXPathNewContext(xml);
if (ctxt == NULL) { if (ctxt == NULL) {
testError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("creating xpath context")); testError(NULL, VIR_ERR_INTERNAL_ERROR, _("creating xpath context"));
goto error; goto error;
} }
@ -349,7 +347,7 @@ static int testOpenFromFile(virConnectPtr conn,
if (ret == 0) { if (ret == 0) {
nodeInfo->nodes = l; nodeInfo->nodes = l;
} else if (ret == -2) { } else if (ret == -2) {
testError(NULL, NULL, NULL, VIR_ERR_XML_ERROR, _("node cpu numa nodes")); testError(NULL, VIR_ERR_XML_ERROR, _("node cpu numa nodes"));
goto error; goto error;
} }
@ -357,7 +355,7 @@ static int testOpenFromFile(virConnectPtr conn,
if (ret == 0) { if (ret == 0) {
nodeInfo->sockets = l; nodeInfo->sockets = l;
} else if (ret == -2) { } else if (ret == -2) {
testError(NULL, NULL, NULL, VIR_ERR_XML_ERROR, _("node cpu sockets")); testError(NULL, VIR_ERR_XML_ERROR, _("node cpu sockets"));
goto error; goto error;
} }
@ -365,7 +363,7 @@ static int testOpenFromFile(virConnectPtr conn,
if (ret == 0) { if (ret == 0) {
nodeInfo->cores = l; nodeInfo->cores = l;
} else if (ret == -2) { } else if (ret == -2) {
testError(NULL, NULL, NULL, VIR_ERR_XML_ERROR, _("node cpu cores")); testError(NULL, VIR_ERR_XML_ERROR, _("node cpu cores"));
goto error; goto error;
} }
@ -373,7 +371,7 @@ static int testOpenFromFile(virConnectPtr conn,
if (ret == 0) { if (ret == 0) {
nodeInfo->threads = l; nodeInfo->threads = l;
} else if (ret == -2) { } else if (ret == -2) {
testError(NULL, NULL, NULL, VIR_ERR_XML_ERROR, _("node cpu threads")); testError(NULL, VIR_ERR_XML_ERROR, _("node cpu threads"));
goto error; goto error;
} }
@ -384,14 +382,14 @@ static int testOpenFromFile(virConnectPtr conn,
nodeInfo->cpus = l; nodeInfo->cpus = l;
} }
} else if (ret == -2) { } else if (ret == -2) {
testError(NULL, NULL, NULL, VIR_ERR_XML_ERROR, _("node active cpu")); testError(NULL, VIR_ERR_XML_ERROR, _("node active cpu"));
goto error; goto error;
} }
ret = virXPathLong(conn, "string(/node/cpu/mhz[1])", ctxt, &l); ret = virXPathLong(conn, "string(/node/cpu/mhz[1])", ctxt, &l);
if (ret == 0) { if (ret == 0) {
nodeInfo->mhz = l; nodeInfo->mhz = l;
} else if (ret == -2) { } else if (ret == -2) {
testError(NULL, NULL, NULL, VIR_ERR_XML_ERROR, _("node cpu mhz")); testError(NULL, VIR_ERR_XML_ERROR, _("node cpu mhz"));
goto error; goto error;
} }
@ -406,13 +404,13 @@ static int testOpenFromFile(virConnectPtr conn,
if (ret == 0) { if (ret == 0) {
nodeInfo->memory = l; nodeInfo->memory = l;
} else if (ret == -2) { } else if (ret == -2) {
testError(NULL, NULL, NULL, VIR_ERR_XML_ERROR, _("node memory")); testError(NULL, VIR_ERR_XML_ERROR, _("node memory"));
goto error; goto error;
} }
ret = virXPathNodeSet(conn, "/node/domain", ctxt, &domains); ret = virXPathNodeSet(conn, "/node/domain", ctxt, &domains);
if (ret < 0) { if (ret < 0) {
testError(NULL, NULL, NULL, VIR_ERR_XML_ERROR, _("node domain list")); testError(NULL, VIR_ERR_XML_ERROR, _("node domain list"));
goto error; goto error;
} }
@ -423,7 +421,7 @@ static int testOpenFromFile(virConnectPtr conn,
char *absFile = testBuildFilename(file, relFile); char *absFile = testBuildFilename(file, relFile);
VIR_FREE(relFile); VIR_FREE(relFile);
if (!absFile) { if (!absFile) {
testError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("resolving domain filename")); testError(NULL, VIR_ERR_INTERNAL_ERROR, _("resolving domain filename"));
goto error; goto error;
} }
def = virDomainDefParseFile(conn, privconn->caps, absFile); def = virDomainDefParseFile(conn, privconn->caps, absFile);
@ -449,7 +447,7 @@ static int testOpenFromFile(virConnectPtr conn,
ret = virXPathNodeSet(conn, "/node/network", ctxt, &networks); ret = virXPathNodeSet(conn, "/node/network", ctxt, &networks);
if (ret < 0) { if (ret < 0) {
testError(NULL, NULL, NULL, VIR_ERR_XML_ERROR, _("node network list")); testError(NULL, VIR_ERR_XML_ERROR, _("node network list"));
goto error; goto error;
} }
for (i = 0 ; i < ret ; i++) { for (i = 0 ; i < ret ; i++) {
@ -459,7 +457,7 @@ static int testOpenFromFile(virConnectPtr conn,
char *absFile = testBuildFilename(file, relFile); char *absFile = testBuildFilename(file, relFile);
VIR_FREE(relFile); VIR_FREE(relFile);
if (!absFile) { if (!absFile) {
testError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("resolving network filename")); testError(NULL, VIR_ERR_INTERNAL_ERROR, _("resolving network filename"));
goto error; goto error;
} }
@ -526,7 +524,7 @@ static int testOpen(virConnectPtr conn,
if (!uri->path if (!uri->path
|| uri->path[0] == '\0' || uri->path[0] == '\0'
|| (uri->path[0] == '/' && uri->path[1] == '\0')) { || (uri->path[0] == '/' && uri->path[1] == '\0')) {
testError (NULL, NULL, NULL, VIR_ERR_INVALID_ARG, testError (NULL, VIR_ERR_INVALID_ARG,
_("testOpen: supply a path or use test:///default")); _("testOpen: supply a path or use test:///default"));
return VIR_DRV_OPEN_ERROR; return VIR_DRV_OPEN_ERROR;
} }
@ -567,13 +565,13 @@ static char *testGetHostname (virConnectPtr conn)
r = gethostname (hostname, HOST_NAME_MAX+1); r = gethostname (hostname, HOST_NAME_MAX+1);
if (r == -1) { if (r == -1) {
testError (conn, NULL, NULL, VIR_ERR_SYSTEM_ERROR, "%s", testError (conn, VIR_ERR_SYSTEM_ERROR, "%s",
strerror (errno)); strerror (errno));
return NULL; return NULL;
} }
str = strdup (hostname); str = strdup (hostname);
if (str == NULL) { if (str == NULL) {
testError (conn, NULL, NULL, VIR_ERR_SYSTEM_ERROR, "%s", testError (conn, VIR_ERR_SYSTEM_ERROR, "%s",
strerror (errno)); strerror (errno));
return NULL; return NULL;
} }
@ -586,7 +584,7 @@ static char * testGetURI (virConnectPtr conn)
GET_CONNECTION(conn); GET_CONNECTION(conn);
if (asprintf (&uri, "test://%s", privconn->path) == -1) { if (asprintf (&uri, "test://%s", privconn->path) == -1) {
testError (conn, NULL, NULL, VIR_ERR_SYSTEM_ERROR, "%s", testError (conn, VIR_ERR_SYSTEM_ERROR, "%s",
strerror (errno)); strerror (errno));
return NULL; return NULL;
} }
@ -613,7 +611,7 @@ static char *testGetCapabilities (virConnectPtr conn)
GET_CONNECTION(conn); GET_CONNECTION(conn);
if ((xml = virCapabilitiesFormatXML(privconn->caps)) == NULL) { if ((xml = virCapabilitiesFormatXML(privconn->caps)) == NULL) {
testError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, NULL); testError(conn, VIR_ERR_NO_MEMORY, NULL);
return NULL; return NULL;
} }
@ -668,7 +666,7 @@ static virDomainPtr testLookupDomainByID(virConnectPtr conn,
GET_CONNECTION(conn); GET_CONNECTION(conn);
if ((dom = virDomainFindByID(&privconn->domains, id)) == NULL) { if ((dom = virDomainFindByID(&privconn->domains, id)) == NULL) {
testError (conn, NULL, NULL, VIR_ERR_NO_DOMAIN, NULL); testError (conn, VIR_ERR_NO_DOMAIN, NULL);
return NULL; return NULL;
} }
@ -687,7 +685,7 @@ static virDomainPtr testLookupDomainByUUID(virConnectPtr conn,
GET_CONNECTION(conn); GET_CONNECTION(conn);
if ((dom = virDomainFindByUUID(&privconn->domains, uuid)) == NULL) { if ((dom = virDomainFindByUUID(&privconn->domains, uuid)) == NULL) {
testError (conn, NULL, NULL, VIR_ERR_NO_DOMAIN, NULL); testError (conn, VIR_ERR_NO_DOMAIN, NULL);
return NULL; return NULL;
} }
@ -706,7 +704,7 @@ static virDomainPtr testLookupDomainByName(virConnectPtr conn,
GET_CONNECTION(conn); GET_CONNECTION(conn);
if ((dom = virDomainFindByName(&privconn->domains, name)) == NULL) { if ((dom = virDomainFindByName(&privconn->domains, name)) == NULL) {
testError (conn, NULL, NULL, VIR_ERR_NO_DOMAIN, NULL); testError (conn, VIR_ERR_NO_DOMAIN, NULL);
return NULL; return NULL;
} }
@ -750,8 +748,9 @@ static int testResumeDomain (virDomainPtr domain)
GET_DOMAIN(domain, -1); GET_DOMAIN(domain, -1);
if (privdom->state != VIR_DOMAIN_PAUSED) { if (privdom->state != VIR_DOMAIN_PAUSED) {
testError(domain->conn, domain, NULL, testError(domain->conn,
VIR_ERR_INTERNAL_ERROR, _("domain not paused")); VIR_ERR_INTERNAL_ERROR, _("domain '%s' not paused"),
domain->name);
return -1; return -1;
} }
@ -765,8 +764,9 @@ static int testPauseDomain (virDomainPtr domain)
if (privdom->state == VIR_DOMAIN_SHUTOFF || if (privdom->state == VIR_DOMAIN_SHUTOFF ||
privdom->state == VIR_DOMAIN_PAUSED) { privdom->state == VIR_DOMAIN_PAUSED) {
testError(domain->conn, domain, NULL, testError(domain->conn,
VIR_ERR_INTERNAL_ERROR, _("domain not running")); VIR_ERR_INTERNAL_ERROR, _("domain '%s' not running"),
domain->name);
return -1; return -1;
} }
@ -779,7 +779,8 @@ static int testShutdownDomain (virDomainPtr domain)
GET_DOMAIN(domain, -1); GET_DOMAIN(domain, -1);
if (privdom->state == VIR_DOMAIN_SHUTOFF) { if (privdom->state == VIR_DOMAIN_SHUTOFF) {
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, "domain not running"); testError(domain->conn, VIR_ERR_INTERNAL_ERROR,
_("domain '%s' not running"), domain->name);
return -1; return -1;
} }
@ -835,7 +836,8 @@ static int testGetDomainInfo (virDomainPtr domain,
GET_DOMAIN(domain, -1); GET_DOMAIN(domain, -1);
if (gettimeofday(&tv, NULL) < 0) { if (gettimeofday(&tv, NULL) < 0) {
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, _("getting time of day")); testError(domain->conn, VIR_ERR_INTERNAL_ERROR,
_("getting time of day"));
return (-1); return (-1);
} }
@ -860,40 +862,46 @@ static int testDomainSave(virDomainPtr domain,
xml = testDomainDumpXML(domain, 0); xml = testDomainDumpXML(domain, 0);
if (xml == NULL) { if (xml == NULL) {
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, testError(domain->conn, VIR_ERR_INTERNAL_ERROR,
_("cannot allocate space for metadata")); _("saving domain '%s' failed to allocate space for metadata: %s"),
domain->name, strerror(errno));
return (-1); return (-1);
} }
if ((fd = open(path, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR)) < 0) { if ((fd = open(path, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR)) < 0) {
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, testError(domain->conn, VIR_ERR_INTERNAL_ERROR,
_("cannot save domain")); _("saving domain '%s' to '%s': open failed: %s"),
domain->name, path, strerror(errno));
return (-1); return (-1);
} }
len = strlen(xml); len = strlen(xml);
if (safewrite(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) < 0) { if (safewrite(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) < 0) {
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, testError(domain->conn, VIR_ERR_INTERNAL_ERROR,
_("cannot write header")); _("saving domain '%s' to '%s': write failed: %s"),
domain->name, path, strerror(errno));
close(fd); close(fd);
return (-1); return (-1);
} }
if (safewrite(fd, (char*)&len, sizeof(len)) < 0) { if (safewrite(fd, (char*)&len, sizeof(len)) < 0) {
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, testError(domain->conn, VIR_ERR_INTERNAL_ERROR,
_("cannot write metadata length")); _("saving domain '%s' to '%s': write failed: %s"),
domain->name, path, strerror(errno));
close(fd); close(fd);
return (-1); return (-1);
} }
if (safewrite(fd, xml, len) < 0) { if (safewrite(fd, xml, len) < 0) {
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, testError(domain->conn, VIR_ERR_INTERNAL_ERROR,
_("cannot write metadata")); _("saving domain '%s' to '%s': write failed: %s"),
domain->name, path, strerror(errno));
VIR_FREE(xml); VIR_FREE(xml);
close(fd); close(fd);
return (-1); return (-1);
} }
VIR_FREE(xml); VIR_FREE(xml);
if (close(fd) < 0) { if (close(fd) < 0) {
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, testError(domain->conn, VIR_ERR_INTERNAL_ERROR,
_("cannot save domain data")); _("saving domain '%s' to '%s': write failed: %s"),
domain->name, path, strerror(errno));
close(fd); close(fd);
return (-1); return (-1);
} }
@ -916,41 +924,41 @@ static int testDomainRestore(virConnectPtr conn,
GET_CONNECTION(conn); GET_CONNECTION(conn);
if ((fd = open(path, O_RDONLY)) < 0) { if ((fd = open(path, O_RDONLY)) < 0) {
testError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, testError(conn, VIR_ERR_INTERNAL_ERROR,
_("cannot read domain image")); _("cannot read domain image"));
return (-1); return (-1);
} }
if (read(fd, magic, sizeof(magic)) != sizeof(magic)) { if (read(fd, magic, sizeof(magic)) != sizeof(magic)) {
testError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, testError(conn, VIR_ERR_INTERNAL_ERROR,
_("incomplete save header")); _("incomplete save header"));
close(fd); close(fd);
return (-1); return (-1);
} }
if (memcmp(magic, TEST_SAVE_MAGIC, sizeof(magic))) { if (memcmp(magic, TEST_SAVE_MAGIC, sizeof(magic))) {
testError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, testError(conn, VIR_ERR_INTERNAL_ERROR,
_("mismatched header magic")); _("mismatched header magic"));
close(fd); close(fd);
return (-1); return (-1);
} }
if (read(fd, (char*)&len, sizeof(len)) != sizeof(len)) { if (read(fd, (char*)&len, sizeof(len)) != sizeof(len)) {
testError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, testError(conn, VIR_ERR_INTERNAL_ERROR,
_("failed to read metadata length")); _("failed to read metadata length"));
close(fd); close(fd);
return (-1); return (-1);
} }
if (len < 1 || len > 8192) { if (len < 1 || len > 8192) {
testError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, testError(conn, VIR_ERR_INTERNAL_ERROR,
_("length of metadata out of range")); _("length of metadata out of range"));
close(fd); close(fd);
return (-1); return (-1);
} }
if (VIR_ALLOC_N(xml, len+1) < 0) { if (VIR_ALLOC_N(xml, len+1) < 0) {
testError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, "xml"); testError(conn, VIR_ERR_NO_MEMORY, "xml");
close(fd); close(fd);
return (-1); return (-1);
} }
if (read(fd, xml, len) != len) { if (read(fd, xml, len) != len) {
testError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, testError(conn, VIR_ERR_INTERNAL_ERROR,
_("incomplete metdata")); _("incomplete metdata"));
close(fd); close(fd);
return (-1); return (-1);
@ -981,19 +989,22 @@ static int testDomainCoreDump(virDomainPtr domain,
GET_DOMAIN(domain, -1); GET_DOMAIN(domain, -1);
if ((fd = open(to, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR)) < 0) { if ((fd = open(to, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR)) < 0) {
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, testError(domain->conn, VIR_ERR_INTERNAL_ERROR,
_("cannot save domain core")); _("domain '%s' coredump: failed to open %s: %s"),
domain->name, to, strerror (errno));
return (-1); return (-1);
} }
if (safewrite(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) < 0) { if (safewrite(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) < 0) {
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, testError(domain->conn, VIR_ERR_INTERNAL_ERROR,
_("cannot write header")); _("domain '%s' coredump: failed to write header to %s: %s"),
domain->name, to, strerror (errno));
close(fd); close(fd);
return (-1); return (-1);
} }
if (close(fd) < 0) { if (close(fd) < 0) {
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, testError(domain->conn, VIR_ERR_INTERNAL_ERROR,
_("cannot save domain data")); _("domain '%s' coredump: write failed: %s: %s"),
domain->name, to, strerror (errno));
close(fd); close(fd);
return (-1); return (-1);
} }
@ -1008,7 +1019,7 @@ static int testDomainCoreDump(virDomainPtr domain,
static char *testGetOSType(virDomainPtr dom) { static char *testGetOSType(virDomainPtr dom) {
char *ret = strdup("linux"); char *ret = strdup("linux");
if (!ret) if (!ret)
testError(dom->conn, dom, NULL, VIR_ERR_NO_MEMORY, NULL); testError(dom->conn, VIR_ERR_NO_MEMORY, NULL);
return ret; return ret;
} }
@ -1034,7 +1045,7 @@ static int testSetMemory(virDomainPtr domain,
GET_DOMAIN(domain, -1); GET_DOMAIN(domain, -1);
if (memory > privdom->def->maxmem) { if (memory > privdom->def->maxmem) {
testError(domain->conn, domain, NULL, testError(domain->conn,
VIR_ERR_INVALID_ARG, __FUNCTION__); VIR_ERR_INVALID_ARG, __FUNCTION__);
return (-1); return (-1);
} }
@ -1049,7 +1060,7 @@ static int testSetVcpus(virDomainPtr domain,
/* We allow more cpus in guest than host */ /* We allow more cpus in guest than host */
if (nrCpus > 32) { if (nrCpus > 32) {
testError(domain->conn, domain, NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); testError(domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__);
return (-1); return (-1);
} }
@ -1096,7 +1107,7 @@ static int testListDefinedDomains(virConnectPtr conn,
return n; return n;
no_memory: no_memory:
testError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, NULL); testError(conn, VIR_ERR_NO_MEMORY, NULL);
for (n = 0 ; n < maxnames ; n++) for (n = 0 ; n < maxnames ; n++)
VIR_FREE(names[n]); VIR_FREE(names[n]);
return -1; return -1;
@ -1135,7 +1146,7 @@ static int testNodeGetCellsFreeMemory(virConnectPtr conn,
GET_CONNECTION(conn); GET_CONNECTION(conn);
if (startCell > privconn->numCells) { if (startCell > privconn->numCells) {
testError(conn, NULL, NULL, VIR_ERR_INVALID_ARG, testError(conn, VIR_ERR_INVALID_ARG,
_("Range exceeds available cells")); _("Range exceeds available cells"));
return -1; return -1;
} }
@ -1154,8 +1165,8 @@ static int testDomainCreate(virDomainPtr domain) {
GET_DOMAIN(domain, -1); GET_DOMAIN(domain, -1);
if (privdom->state != VIR_DOMAIN_SHUTOFF) { if (privdom->state != VIR_DOMAIN_SHUTOFF) {
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, testError(domain->conn, VIR_ERR_INTERNAL_ERROR,
_("Domain is already running")); _("Domain '%s' is already running"), domain->name);
return (-1); return (-1);
} }
@ -1169,8 +1180,8 @@ static int testDomainUndefine(virDomainPtr domain) {
GET_DOMAIN(domain, -1); GET_DOMAIN(domain, -1);
if (privdom->state != VIR_DOMAIN_SHUTOFF) { if (privdom->state != VIR_DOMAIN_SHUTOFF) {
testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, testError(domain->conn, VIR_ERR_INTERNAL_ERROR,
_("Domain is still running")); _("Domain '%s' is still running"), domain->name);
return (-1); return (-1);
} }
@ -1205,7 +1216,7 @@ static char *testDomainGetSchedulerType(virDomainPtr domain,
*nparams = 1; *nparams = 1;
type = strdup("fair"); type = strdup("fair");
if (!type) { if (!type) {
testError(domain->conn, domain, NULL, VIR_ERR_NO_MEMORY, "schedular"); testError(domain->conn, VIR_ERR_NO_MEMORY, "schedular");
return (NULL); return (NULL);
} }
return type; return type;
@ -1217,7 +1228,7 @@ static int testDomainGetSchedulerParams(virDomainPtr domain,
{ {
GET_DOMAIN(domain, -1); GET_DOMAIN(domain, -1);
if (*nparams != 1) { if (*nparams != 1) {
testError(domain->conn, domain, NULL, VIR_ERR_INVALID_ARG, "nparams"); testError(domain->conn, VIR_ERR_INVALID_ARG, "nparams");
return (-1); return (-1);
} }
strcpy(params[0].field, "weight"); strcpy(params[0].field, "weight");
@ -1235,15 +1246,15 @@ static int testDomainSetSchedulerParams(virDomainPtr domain,
{ {
GET_DOMAIN(domain, -1); GET_DOMAIN(domain, -1);
if (nparams != 1) { if (nparams != 1) {
testError(domain->conn, domain, NULL, VIR_ERR_INVALID_ARG, "nparams"); testError(domain->conn, VIR_ERR_INVALID_ARG, "nparams");
return (-1); return (-1);
} }
if (STRNEQ(params[0].field, "weight")) { if (STRNEQ(params[0].field, "weight")) {
testError(domain->conn, domain, NULL, VIR_ERR_INVALID_ARG, "field"); testError(domain->conn, VIR_ERR_INVALID_ARG, "field");
return (-1); return (-1);
} }
if (params[0].type != VIR_DOMAIN_SCHED_FIELD_UINT) { if (params[0].type != VIR_DOMAIN_SCHED_FIELD_UINT) {
testError(domain->conn, domain, NULL, VIR_ERR_INVALID_ARG, "type"); testError(domain->conn, VIR_ERR_INVALID_ARG, "type");
return (-1); return (-1);
} }
/* XXX */ /* XXX */
@ -1275,7 +1286,7 @@ static virNetworkPtr testLookupNetworkByUUID(virConnectPtr conn,
GET_CONNECTION(conn); GET_CONNECTION(conn);
if ((net = virNetworkFindByUUID(&privconn->networks, uuid)) == NULL) { if ((net = virNetworkFindByUUID(&privconn->networks, uuid)) == NULL) {
testError (conn, NULL, NULL, VIR_ERR_NO_NETWORK, NULL); testError (conn, VIR_ERR_NO_NETWORK, NULL);
return NULL; return NULL;
} }
@ -1289,7 +1300,7 @@ static virNetworkPtr testLookupNetworkByName(virConnectPtr conn,
GET_CONNECTION(conn); GET_CONNECTION(conn);
if ((net = virNetworkFindByName(&privconn->networks, name)) == NULL) { if ((net = virNetworkFindByName(&privconn->networks, name)) == NULL) {
testError (conn, NULL, NULL, VIR_ERR_NO_NETWORK, NULL); testError (conn, VIR_ERR_NO_NETWORK, NULL);
return NULL; return NULL;
} }
@ -1321,7 +1332,7 @@ static int testListNetworks(virConnectPtr conn, char **const names, int nnames)
return n; return n;
no_memory: no_memory:
testError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, NULL); testError(conn, VIR_ERR_NO_MEMORY, NULL);
for (n = 0 ; n < nnames ; n++) for (n = 0 ; n < nnames ; n++)
VIR_FREE(names[n]); VIR_FREE(names[n]);
return (-1); return (-1);
@ -1351,7 +1362,7 @@ static int testListDefinedNetworks(virConnectPtr conn, char **const names, int n
return n; return n;
no_memory: no_memory:
testError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, NULL); testError(conn, VIR_ERR_NO_MEMORY, NULL);
for (n = 0 ; n < nnames ; n++) for (n = 0 ; n < nnames ; n++)
VIR_FREE(names[n]); VIR_FREE(names[n]);
return (-1); return (-1);
@ -1397,8 +1408,8 @@ static int testNetworkUndefine(virNetworkPtr network) {
GET_NETWORK(network, -1); GET_NETWORK(network, -1);
if (virNetworkIsActive(privnet)) { if (virNetworkIsActive(privnet)) {
testError(network->conn, NULL, network, VIR_ERR_INTERNAL_ERROR, testError(network->conn, VIR_ERR_INTERNAL_ERROR,
_("Network is still running")); _("Network '%s' is still running"), network->name);
return (-1); return (-1);
} }
@ -1412,8 +1423,8 @@ static int testNetworkStart(virNetworkPtr network) {
GET_NETWORK(network, -1); GET_NETWORK(network, -1);
if (virNetworkIsActive(privnet)) { if (virNetworkIsActive(privnet)) {
testError(network->conn, NULL, network, VIR_ERR_INTERNAL_ERROR, testError(network->conn, VIR_ERR_INTERNAL_ERROR,
_("Network is already running")); _("Network '%s' is already running"), network->name);
return (-1); return (-1);
} }
@ -1444,7 +1455,7 @@ static char *testNetworkGetBridgeName(virNetworkPtr network) {
GET_NETWORK(network, NULL); GET_NETWORK(network, NULL);
if (privnet->def->bridge && if (privnet->def->bridge &&
!(bridge = strdup(privnet->def->bridge))) { !(bridge = strdup(privnet->def->bridge))) {
testError(network->conn, NULL, network, VIR_ERR_NO_MEMORY, "network"); testError(network->conn, VIR_ERR_NO_MEMORY, "network");
return NULL; return NULL;
} }
return bridge; return bridge;

2
tests/undefine
View File

@ -29,7 +29,7 @@ fail=0
virsh -q -c test:///default undefine test > out 2>&1 virsh -q -c test:///default undefine test > out 2>&1
test $? = 1 || fail=1 test $? = 1 || fail=1
cat <<\EOF > exp || fail=1 cat <<\EOF > exp || fail=1
libvir: Test error test: internal error Domain is still running libvir: Test error : internal error Domain 'test' is still running
error: Failed to undefine domain test error: Failed to undefine domain test
EOF EOF
compare out exp || fail=1 compare out exp || fail=1