[libvirt] [PATCH 04/23] Replace use of testError with virReportError

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Update the test driver to use virReportError instead of the testError custom macro Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- src/test/test_driver.c | 509 ++++++++++++++++++++++++------------------------ 1 file changed, 255 insertions(+), 254 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 061f687..990b20d 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -115,10 +115,6 @@ static const virNodeInfo defaultNodeInfo = { }; -#define testError(code, ...) \ - virReportErrorHelper(VIR_FROM_TEST, code, __FILE__, \ - __FUNCTION__, __LINE__, __VA_ARGS__) - static int testClose(virConnectPtr conn); static void testDomainEventQueue(testConnPtr driver, virDomainEventPtr event); @@ -348,8 +344,8 @@ testDomainGenerateIfname(virDomainDefPtr domdef) { return ifname; } - testError(VIR_ERR_INTERNAL_ERROR, - _("Exceeded max iface limit %d"), maxif); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Exceeded max iface limit %d"), maxif); return NULL; } @@ -527,8 +523,8 @@ static int testOpenDefault(virConnectPtr conn) { return VIR_DRV_OPEN_ERROR; } if (virMutexInit(&privconn->lock) < 0) { - testError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot initialize mutex")); + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("cannot initialize mutex")); VIR_FREE(privconn); return VIR_DRV_OPEN_ERROR; } @@ -694,8 +690,8 @@ static int testOpenVolumesForPool(xmlDocPtr xml, char *absFile = testBuildFilename(file, relFile); VIR_FREE(relFile); if (!absFile) { - testError(VIR_ERR_INTERNAL_ERROR, "%s", - _("resolving volume filename")); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("resolving volume filename")); goto error; } @@ -767,8 +763,8 @@ static int testOpenFromFile(virConnectPtr conn, return VIR_DRV_OPEN_ERROR; } if (virMutexInit(&privconn->lock) < 0) { - testError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot initialize mutex")); + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("cannot initialize mutex")); VIR_FREE(privconn); return VIR_DRV_OPEN_ERROR; } @@ -787,8 +783,8 @@ static int testOpenFromFile(virConnectPtr conn, } if (!xmlStrEqual(ctxt->node->name, BAD_CAST "node")) { - testError(VIR_ERR_XML_ERROR, "%s", - _("Root element is not 'node'")); + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Root element is not 'node'")); goto error; } @@ -805,8 +801,8 @@ static int testOpenFromFile(virConnectPtr conn, if (ret == 0) { nodeInfo->nodes = l; } else if (ret == -2) { - testError(VIR_ERR_XML_ERROR, "%s", - _("invalid node cpu nodes value")); + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid node cpu nodes value")); goto error; } @@ -814,8 +810,8 @@ static int testOpenFromFile(virConnectPtr conn, if (ret == 0) { nodeInfo->sockets = l; } else if (ret == -2) { - testError(VIR_ERR_XML_ERROR, "%s", - _("invalid node cpu sockets value")); + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid node cpu sockets value")); goto error; } @@ -823,8 +819,8 @@ static int testOpenFromFile(virConnectPtr conn, if (ret == 0) { nodeInfo->cores = l; } else if (ret == -2) { - testError(VIR_ERR_XML_ERROR, "%s", - _("invalid node cpu cores value")); + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid node cpu cores value")); goto error; } @@ -832,8 +828,8 @@ static int testOpenFromFile(virConnectPtr conn, if (ret == 0) { nodeInfo->threads = l; } else if (ret == -2) { - testError(VIR_ERR_XML_ERROR, "%s", - _("invalid node cpu threads value")); + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid node cpu threads value")); goto error; } @@ -844,24 +840,24 @@ static int testOpenFromFile(virConnectPtr conn, nodeInfo->cpus = l; } } else if (ret == -2) { - testError(VIR_ERR_XML_ERROR, "%s", - _("invalid node cpu active value")); + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid node cpu active value")); goto error; } ret = virXPathLong("string(/node/cpu/mhz[1])", ctxt, &l); if (ret == 0) { nodeInfo->mhz = l; } else if (ret == -2) { - testError(VIR_ERR_XML_ERROR, "%s", - _("invalid node cpu mhz value")); + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid node cpu mhz value")); goto error; } str = virXPathString("string(/node/cpu/model[1])", ctxt); if (str != NULL) { if (virStrcpyStatic(nodeInfo->model, str) == NULL) { - testError(VIR_ERR_INTERNAL_ERROR, - _("Model %s too big for destination"), str); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Model %s too big for destination"), str); VIR_FREE(str); goto error; } @@ -872,8 +868,8 @@ static int testOpenFromFile(virConnectPtr conn, if (ret == 0) { nodeInfo->memory = l; } else if (ret == -2) { - testError(VIR_ERR_XML_ERROR, "%s", - _("invalid node memory value")); + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid node memory value")); goto error; } @@ -889,7 +885,8 @@ static int testOpenFromFile(virConnectPtr conn, char *absFile = testBuildFilename(file, relFile); VIR_FREE(relFile); if (!absFile) { - testError(VIR_ERR_INTERNAL_ERROR, "%s", _("resolving domain filename")); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("resolving domain filename")); goto error; } def = virDomainDefParseFile(privconn->caps, absFile, @@ -933,7 +930,8 @@ static int testOpenFromFile(virConnectPtr conn, char *absFile = testBuildFilename(file, relFile); VIR_FREE(relFile); if (!absFile) { - testError(VIR_ERR_INTERNAL_ERROR, "%s", _("resolving network filename")); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("resolving network filename")); goto error; } @@ -968,7 +966,8 @@ static int testOpenFromFile(virConnectPtr conn, char *absFile = testBuildFilename(file, relFile); VIR_FREE(relFile); if (!absFile) { - testError(VIR_ERR_INTERNAL_ERROR, "%s", _("resolving interface filename")); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("resolving interface filename")); goto error; } @@ -1004,8 +1003,8 @@ static int testOpenFromFile(virConnectPtr conn, char *absFile = testBuildFilename(file, relFile); VIR_FREE(relFile); if (!absFile) { - testError(VIR_ERR_INTERNAL_ERROR, "%s", - _("resolving pool filename")); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("resolving pool filename")); goto error; } @@ -1056,8 +1055,8 @@ static int testOpenFromFile(virConnectPtr conn, VIR_FREE(relFile); if (!absFile) { - testError(VIR_ERR_INTERNAL_ERROR, "%s", - _("resolving device filename")); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("resolving device filename")); goto error; } @@ -1127,8 +1126,8 @@ static virDrvOpenStatus testOpen(virConnectPtr conn, if (!conn->uri->path || conn->uri->path[0] == '\0' || (conn->uri->path[0] == '/' && conn->uri->path[1] == '\0')) { - testError(VIR_ERR_INVALID_ARG, - "%s", _("testOpen: supply a path or use test:///default")); + virReportError(VIR_ERR_INVALID_ARG, + "%s", _("testOpen: supply a path or use test:///default")); return VIR_DRV_OPEN_ERROR; } @@ -1248,7 +1247,7 @@ static int testDomainIsActive(virDomainPtr dom) obj = virDomainFindByUUID(&privconn->domains, dom->uuid); testDriverUnlock(privconn); if (!obj) { - testError(VIR_ERR_NO_DOMAIN, NULL); + virReportError(VIR_ERR_NO_DOMAIN, NULL); goto cleanup; } ret = virDomainObjIsActive(obj); @@ -1269,7 +1268,7 @@ static int testDomainIsPersistent(virDomainPtr dom) obj = virDomainFindByUUID(&privconn->domains, dom->uuid); testDriverUnlock(privconn); if (!obj) { - testError(VIR_ERR_NO_DOMAIN, NULL); + virReportError(VIR_ERR_NO_DOMAIN, NULL); goto cleanup; } ret = obj->persistent; @@ -1347,7 +1346,7 @@ static virDomainPtr testLookupDomainByID(virConnectPtr conn, testDriverUnlock(privconn); if (dom == NULL) { - testError(VIR_ERR_NO_DOMAIN, NULL); + virReportError(VIR_ERR_NO_DOMAIN, NULL); goto cleanup; } @@ -1373,7 +1372,7 @@ static virDomainPtr testLookupDomainByUUID(virConnectPtr conn, testDriverUnlock(privconn); if (dom == NULL) { - testError(VIR_ERR_NO_DOMAIN, NULL); + virReportError(VIR_ERR_NO_DOMAIN, NULL); goto cleanup; } @@ -1399,7 +1398,7 @@ static virDomainPtr testLookupDomainByName(virConnectPtr conn, testDriverUnlock(privconn); if (dom == NULL) { - testError(VIR_ERR_NO_DOMAIN, NULL); + virReportError(VIR_ERR_NO_DOMAIN, NULL); goto cleanup; } @@ -1439,7 +1438,7 @@ static int testDestroyDomain (virDomainPtr domain) domain->name); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -1477,13 +1476,13 @@ static int testResumeDomain (virDomainPtr domain) testDriverUnlock(privconn); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (virDomainObjGetState(privdom, NULL) != VIR_DOMAIN_PAUSED) { - testError(VIR_ERR_INTERNAL_ERROR, _("domain '%s' not paused"), - domain->name); + virReportError(VIR_ERR_INTERNAL_ERROR, _("domain '%s' not paused"), + domain->name); goto cleanup; } @@ -1519,14 +1518,14 @@ static int testPauseDomain (virDomainPtr domain) testDriverUnlock(privconn); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } state = virDomainObjGetState(privdom, NULL); if (state == VIR_DOMAIN_SHUTOFF || state == VIR_DOMAIN_PAUSED) { - testError(VIR_ERR_INTERNAL_ERROR, _("domain '%s' not running"), - domain->name); + virReportError(VIR_ERR_INTERNAL_ERROR, _("domain '%s' not running"), + domain->name); goto cleanup; } @@ -1563,13 +1562,13 @@ static int testShutdownDomainFlags(virDomainPtr domain, domain->name); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (virDomainObjGetState(privdom, NULL) == VIR_DOMAIN_SHUTOFF) { - testError(VIR_ERR_INTERNAL_ERROR, - _("domain '%s' not running"), domain->name); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("domain '%s' not running"), domain->name); goto cleanup; } @@ -1613,7 +1612,7 @@ static int testRebootDomain (virDomainPtr domain, domain->name); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -1684,13 +1683,13 @@ static int testGetDomainInfo (virDomainPtr domain, testDriverUnlock(privconn); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (gettimeofday(&tv, NULL) < 0) { - testError(VIR_ERR_INTERNAL_ERROR, - "%s", _("getting time of day")); + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("getting time of day")); goto cleanup; } @@ -1725,7 +1724,7 @@ testDomainGetState(virDomainPtr domain, testDriverUnlock(privconn); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -1754,8 +1753,8 @@ testDomainSaveFlags(virDomainPtr domain, const char *path, virCheckFlags(0, -1); if (dxml) { - testError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("xml modification unsupported")); + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("xml modification unsupported")); return -1; } @@ -1764,7 +1763,7 @@ testDomainSaveFlags(virDomainPtr domain, const char *path, domain->name); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -1867,8 +1866,8 @@ testDomainRestoreFlags(virConnectPtr conn, virCheckFlags(0, -1); if (dxml) { - testError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("xml modification unsupported")); + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("xml modification unsupported")); return -1; } @@ -1887,8 +1886,8 @@ testDomainRestoreFlags(virConnectPtr conn, goto cleanup; } if (memcmp(magic, TEST_SAVE_MAGIC, sizeof(magic))) { - testError(VIR_ERR_INTERNAL_ERROR, - "%s", _("mismatched header magic")); + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("mismatched header magic")); goto cleanup; } if (saferead(fd, (char*)&len, sizeof(len)) != sizeof(len)) { @@ -1898,8 +1897,8 @@ testDomainRestoreFlags(virConnectPtr conn, goto cleanup; } if (len < 1 || len > 8192) { - testError(VIR_ERR_INTERNAL_ERROR, - "%s", _("length of metadata out of range")); + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("length of metadata out of range")); goto cleanup; } if (VIR_ALLOC_N(xml, len+1) < 0) { @@ -1973,7 +1972,7 @@ static int testDomainCoreDump(virDomainPtr domain, domain->name); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -2037,7 +2036,7 @@ static unsigned long long testGetMaxMemory(virDomainPtr domain) { testDriverUnlock(privconn); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -2062,7 +2061,7 @@ static int testSetMaxMemory(virDomainPtr domain, testDriverUnlock(privconn); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -2089,12 +2088,12 @@ static int testSetMemory(virDomainPtr domain, testDriverUnlock(privconn); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (memory > privdom->def->mem.max_balloon) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -2126,8 +2125,8 @@ testDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) if (!vm) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(domain->uuid, uuidstr); - testError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); goto cleanup; } @@ -2170,13 +2169,13 @@ testDomainSetVcpusFlags(virDomainPtr domain, unsigned int nrCpus, if ((flags & (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG)) == 0 || (flags & (VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_AFFECT_LIVE)) == (VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_AFFECT_LIVE)) { - testError(VIR_ERR_INVALID_ARG, - _("invalid flag combination: (0x%x)"), flags); + virReportError(VIR_ERR_INVALID_ARG, + _("invalid flag combination: (0x%x)"), flags); return -1; } if (!nrCpus || (maxvcpus = testGetMaxVCPUs(domain->conn, NULL)) < nrCpus) { - testError(VIR_ERR_INVALID_ARG, - _("argument out of range: %d"), nrCpus); + virReportError(VIR_ERR_INVALID_ARG, + _("argument out of range: %d"), nrCpus); return -1; } @@ -2185,13 +2184,13 @@ testDomainSetVcpusFlags(virDomainPtr domain, unsigned int nrCpus, testDriverUnlock(privconn); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (!virDomainObjIsActive(privdom) && (flags & VIR_DOMAIN_AFFECT_LIVE)) { - testError(VIR_ERR_OPERATION_INVALID, - "%s", _("cannot hotplug vcpus for an inactive domain")); + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("cannot hotplug vcpus for an inactive domain")); goto cleanup; } @@ -2202,9 +2201,9 @@ testDomainSetVcpusFlags(virDomainPtr domain, unsigned int nrCpus, maxvcpus = privdom->def->maxvcpus; if (nrCpus > maxvcpus) { - testError(VIR_ERR_INVALID_ARG, - _("requested cpu amount exceeds maximum (%d > %d)"), - nrCpus, maxvcpus); + virReportError(VIR_ERR_INVALID_ARG, + _("requested cpu amount exceeds maximum (%d > %d)"), + nrCpus, maxvcpus); goto cleanup; } @@ -2268,13 +2267,13 @@ static int testDomainGetVcpus(virDomainPtr domain, testDriverUnlock(privconn); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (!virDomainObjIsActive(privdom)) { - testError(VIR_ERR_OPERATION_INVALID, - "%s",_("cannot list vcpus for an inactive domain")); + virReportError(VIR_ERR_OPERATION_INVALID, + "%s",_("cannot list vcpus for an inactive domain")); goto cleanup; } @@ -2354,19 +2353,19 @@ static int testDomainPinVcpu(virDomainPtr domain, testDriverUnlock(privconn); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (!virDomainObjIsActive(privdom)) { - testError(VIR_ERR_OPERATION_INVALID, - "%s",_("cannot pin vcpus on an inactive domain")); + virReportError(VIR_ERR_OPERATION_INVALID, + "%s",_("cannot pin vcpus on an inactive domain")); goto cleanup; } if (vcpu > privdom->def->vcpus) { - testError(VIR_ERR_INVALID_ARG, "%s", - _("requested vcpu is higher than allocated vcpus")); + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("requested vcpu is higher than allocated vcpus")); goto cleanup; } @@ -2409,7 +2408,7 @@ static char *testDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) testDriverUnlock(privconn); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -2506,8 +2505,8 @@ static int testNodeGetCellsFreeMemory(virConnectPtr conn, testDriverLock(privconn); if (startCell > privconn->numCells) { - testError(VIR_ERR_INVALID_ARG, - "%s", _("Range exceeds available cells")); + virReportError(VIR_ERR_INVALID_ARG, + "%s", _("Range exceeds available cells")); goto cleanup; } @@ -2537,13 +2536,13 @@ static int testDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) { domain->name); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (virDomainObjGetState(privdom, NULL) != VIR_DOMAIN_SHUTOFF) { - testError(VIR_ERR_INTERNAL_ERROR, - _("Domain '%s' is already running"), domain->name); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Domain '%s' is already running"), domain->name); goto cleanup; } @@ -2585,7 +2584,7 @@ static int testDomainUndefineFlags(virDomainPtr domain, domain->name); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -2629,7 +2628,7 @@ static int testDomainGetAutostart(virDomainPtr domain, testDriverUnlock(privconn); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -2656,7 +2655,7 @@ static int testDomainSetAutostart(virDomainPtr domain, testDriverUnlock(privconn); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -2702,7 +2701,7 @@ testDomainGetSchedulerParamsFlags(virDomainPtr domain, testDriverUnlock(privconn); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -2752,7 +2751,7 @@ testDomainSetSchedulerParamsFlags(virDomainPtr domain, testDriverUnlock(privconn); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -2795,13 +2794,13 @@ static int testDomainBlockStats(virDomainPtr domain, testDriverUnlock(privconn); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } if (virDomainDiskIndexByName(privdom->def, path, false) < 0) { - testError(VIR_ERR_INVALID_ARG, - _("invalid path: %s"), path); + virReportError(VIR_ERR_INVALID_ARG, + _("invalid path: %s"), path); goto error; } @@ -2842,7 +2841,7 @@ static int testDomainInterfaceStats(virDomainPtr domain, testDriverUnlock(privconn); if (privdom == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } @@ -2855,8 +2854,8 @@ static int testDomainInterfaceStats(virDomainPtr domain, } if (!found) { - testError(VIR_ERR_INVALID_ARG, - _("invalid path, '%s' is not a known interface"), path); + virReportError(VIR_ERR_INVALID_ARG, + _("invalid path, '%s' is not a known interface"), path); goto error; } @@ -2915,7 +2914,7 @@ static virNetworkPtr testLookupNetworkByUUID(virConnectPtr conn, testDriverUnlock(privconn); if (net == NULL) { - testError(VIR_ERR_NO_NETWORK, NULL); + virReportError(VIR_ERR_NO_NETWORK, NULL); goto cleanup; } @@ -2939,7 +2938,7 @@ static virNetworkPtr testLookupNetworkByName(virConnectPtr conn, testDriverUnlock(privconn); if (net == NULL) { - testError(VIR_ERR_NO_NETWORK, NULL); + virReportError(VIR_ERR_NO_NETWORK, NULL); goto cleanup; } @@ -3049,7 +3048,7 @@ static int testNetworkIsActive(virNetworkPtr net) obj = virNetworkFindByUUID(&privconn->networks, net->uuid); testDriverUnlock(privconn); if (!obj) { - testError(VIR_ERR_NO_NETWORK, NULL); + virReportError(VIR_ERR_NO_NETWORK, NULL); goto cleanup; } ret = virNetworkObjIsActive(obj); @@ -3070,7 +3069,7 @@ static int testNetworkIsPersistent(virNetworkPtr net) obj = virNetworkFindByUUID(&privconn->networks, net->uuid); testDriverUnlock(privconn); if (!obj) { - testError(VIR_ERR_NO_NETWORK, NULL); + virReportError(VIR_ERR_NO_NETWORK, NULL); goto cleanup; } ret = obj->persistent; @@ -3142,13 +3141,13 @@ static int testNetworkUndefine(virNetworkPtr network) { network->name); if (privnet == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (virNetworkObjIsActive(privnet)) { - testError(VIR_ERR_OPERATION_INVALID, - _("Network '%s' is still running"), network->name); + virReportError(VIR_ERR_OPERATION_INVALID, + _("Network '%s' is still running"), network->name); goto cleanup; } @@ -3175,13 +3174,13 @@ static int testNetworkStart(virNetworkPtr network) { testDriverUnlock(privconn); if (privnet == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (virNetworkObjIsActive(privnet)) { - testError(VIR_ERR_OPERATION_INVALID, - _("Network '%s' is already running"), network->name); + virReportError(VIR_ERR_OPERATION_INVALID, + _("Network '%s' is already running"), network->name); goto cleanup; } @@ -3204,7 +3203,7 @@ static int testNetworkDestroy(virNetworkPtr network) { network->name); if (privnet == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -3238,7 +3237,7 @@ static char *testNetworkGetXMLDesc(virNetworkPtr network, testDriverUnlock(privconn); if (privnet == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -3261,14 +3260,14 @@ static char *testNetworkGetBridgeName(virNetworkPtr network) { testDriverUnlock(privconn); if (privnet == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (!(privnet->def->bridge)) { - testError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' does not have a bridge name."), - privnet->def->name); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("network '%s' does not have a bridge name."), + privnet->def->name); goto cleanup; } @@ -3295,7 +3294,7 @@ static int testNetworkGetAutostart(virNetworkPtr network, testDriverUnlock(privconn); if (privnet == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -3320,7 +3319,7 @@ static int testNetworkSetAutostart(virNetworkPtr network, testDriverUnlock(privconn); if (privnet == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -3462,7 +3461,7 @@ static virInterfacePtr testLookupInterfaceByName(virConnectPtr conn, testDriverUnlock(privconn); if (iface == NULL) { - testError(VIR_ERR_NO_INTERFACE, NULL); + virReportError(VIR_ERR_NO_INTERFACE, NULL); goto cleanup; } @@ -3487,12 +3486,12 @@ static virInterfacePtr testLookupInterfaceByMACString(virConnectPtr conn, testDriverUnlock(privconn); if (ifacect == 0) { - testError(VIR_ERR_NO_INTERFACE, NULL); + virReportError(VIR_ERR_NO_INTERFACE, NULL); goto cleanup; } if (ifacect > 1) { - testError(VIR_ERR_MULTIPLE_INTERFACES, NULL); + virReportError(VIR_ERR_MULTIPLE_INTERFACES, NULL); goto cleanup; } @@ -3514,7 +3513,7 @@ static int testInterfaceIsActive(virInterfacePtr iface) obj = virInterfaceFindByName(&privconn->ifaces, iface->name); testDriverUnlock(privconn); if (!obj) { - testError(VIR_ERR_NO_INTERFACE, NULL); + virReportError(VIR_ERR_NO_INTERFACE, NULL); goto cleanup; } ret = virInterfaceObjIsActive(obj); @@ -3535,8 +3534,8 @@ static int testInterfaceChangeBegin(virConnectPtr conn, testDriverLock(privconn); if (privconn->transaction_running) { - testError(VIR_ERR_OPERATION_INVALID, - _("there is another transaction running.")); + virReportError(VIR_ERR_OPERATION_INVALID, + _("there is another transaction running.")); goto cleanup; } @@ -3563,8 +3562,9 @@ static int testInterfaceChangeCommit(virConnectPtr conn, testDriverLock(privconn); if (!privconn->transaction_running) { - testError(VIR_ERR_OPERATION_INVALID, _("no transaction running, " - "nothing to be committed.")); + virReportError(VIR_ERR_OPERATION_INVALID, + _("no transaction running, " + "nothing to be committed.")); goto cleanup; } @@ -3590,8 +3590,9 @@ static int testInterfaceChangeRollback(virConnectPtr conn, testDriverLock(privconn); if (!privconn->transaction_running) { - testError(VIR_ERR_OPERATION_INVALID, _("no transaction running, " - "nothing to rollback.")); + virReportError(VIR_ERR_OPERATION_INVALID, + _("no transaction running, " + "nothing to rollback.")); goto cleanup; } @@ -3625,7 +3626,7 @@ static char *testInterfaceGetXMLDesc(virInterfacePtr iface, testDriverUnlock(privconn); if (privinterface == NULL) { - testError(VIR_ERR_NO_INTERFACE, __FUNCTION__); + virReportError(VIR_ERR_NO_INTERFACE, __FUNCTION__); goto cleanup; } @@ -3677,7 +3678,7 @@ static int testInterfaceUndefine(virInterfacePtr iface) iface->name); if (privinterface == NULL) { - testError(VIR_ERR_NO_INTERFACE, NULL); + virReportError(VIR_ERR_NO_INTERFACE, NULL); goto cleanup; } @@ -3704,12 +3705,12 @@ static int testInterfaceCreate(virInterfacePtr iface, iface->name); if (privinterface == NULL) { - testError(VIR_ERR_NO_INTERFACE, NULL); + virReportError(VIR_ERR_NO_INTERFACE, NULL); goto cleanup; } if (privinterface->active != 0) { - testError(VIR_ERR_OPERATION_INVALID, NULL); + virReportError(VIR_ERR_OPERATION_INVALID, NULL); goto cleanup; } @@ -3737,12 +3738,12 @@ static int testInterfaceDestroy(virInterfacePtr iface, iface->name); if (privinterface == NULL) { - testError(VIR_ERR_NO_INTERFACE, NULL); + virReportError(VIR_ERR_NO_INTERFACE, NULL); goto cleanup; } if (privinterface->active == 0) { - testError(VIR_ERR_OPERATION_INVALID, NULL); + virReportError(VIR_ERR_OPERATION_INVALID, NULL); goto cleanup; } @@ -3809,7 +3810,7 @@ testStoragePoolLookupByUUID(virConnectPtr conn, testDriverUnlock(privconn); if (pool == NULL) { - testError(VIR_ERR_NO_STORAGE_POOL, NULL); + virReportError(VIR_ERR_NO_STORAGE_POOL, NULL); goto cleanup; } @@ -3833,7 +3834,7 @@ testStoragePoolLookupByName(virConnectPtr conn, testDriverUnlock(privconn); if (pool == NULL) { - testError(VIR_ERR_NO_STORAGE_POOL, NULL); + virReportError(VIR_ERR_NO_STORAGE_POOL, NULL); goto cleanup; } @@ -3952,7 +3953,7 @@ static int testStoragePoolIsActive(virStoragePoolPtr pool) obj = virStoragePoolObjFindByUUID(&privconn->pools, pool->uuid); testDriverUnlock(privconn); if (!obj) { - testError(VIR_ERR_NO_STORAGE_POOL, NULL); + virReportError(VIR_ERR_NO_STORAGE_POOL, NULL); goto cleanup; } ret = virStoragePoolObjIsActive(obj); @@ -3973,7 +3974,7 @@ static int testStoragePoolIsPersistent(virStoragePoolPtr pool) obj = virStoragePoolObjFindByUUID(&privconn->pools, pool->uuid); testDriverUnlock(privconn); if (!obj) { - testError(VIR_ERR_NO_STORAGE_POOL, NULL); + virReportError(VIR_ERR_NO_STORAGE_POOL, NULL); goto cleanup; } ret = obj->configFile ? 1 : 0; @@ -4002,13 +4003,13 @@ testStoragePoolStart(virStoragePoolPtr pool, testDriverUnlock(privconn); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is already active"), pool->name); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is already active"), pool->name); goto cleanup; } @@ -4035,8 +4036,8 @@ testStorageFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, pool_type = virStoragePoolTypeFromString(type); if (!pool_type) { - testError(VIR_ERR_INTERNAL_ERROR, - _("unknown storage pool type %s"), type); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown storage pool type %s"), type); goto cleanup; } @@ -4056,8 +4057,8 @@ testStorageFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, case VIR_STORAGE_POOL_NETFS: if (!source || !source->hosts[0].name) { - testError(VIR_ERR_INVALID_ARG, - "%s", _("hostname must be specified for netfs sources")); + virReportError(VIR_ERR_INVALID_ARG, + "%s", _("hostname must be specified for netfs sources")); goto cleanup; } @@ -4067,8 +4068,8 @@ testStorageFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, break; default: - testError(VIR_ERR_NO_SUPPORT, - _("pool type '%s' does not support source discovery"), type); + virReportError(VIR_ERR_NO_SUPPORT, + _("pool type '%s' does not support source discovery"), type); } cleanup: @@ -4097,8 +4098,8 @@ testStoragePoolCreate(virConnectPtr conn, if (!pool) pool = virStoragePoolObjFindByName(&privconn->pools, def->name); if (pool) { - testError(VIR_ERR_INTERNAL_ERROR, - "%s", _("storage pool already exists")); + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("storage pool already exists")); goto cleanup; } @@ -4174,13 +4175,13 @@ testStoragePoolUndefine(virStoragePoolPtr pool) { pool->name); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is already active"), pool->name); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is already active"), pool->name); goto cleanup; } @@ -4210,13 +4211,13 @@ testStoragePoolBuild(virStoragePoolPtr pool, testDriverUnlock(privconn); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is already active"), pool->name); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is already active"), pool->name); goto cleanup; } ret = 0; @@ -4239,13 +4240,13 @@ testStoragePoolDestroy(virStoragePoolPtr pool) { pool->name); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), pool->name); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), pool->name); goto cleanup; } @@ -4281,13 +4282,13 @@ testStoragePoolDelete(virStoragePoolPtr pool, testDriverUnlock(privconn); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is already active"), pool->name); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is already active"), pool->name); goto cleanup; } @@ -4316,13 +4317,13 @@ testStoragePoolRefresh(virStoragePoolPtr pool, testDriverUnlock(privconn); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), pool->name); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), pool->name); goto cleanup; } ret = 0; @@ -4347,7 +4348,7 @@ testStoragePoolGetInfo(virStoragePoolPtr pool, testDriverUnlock(privconn); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -4383,7 +4384,7 @@ testStoragePoolGetXMLDesc(virStoragePoolPtr pool, testDriverUnlock(privconn); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -4408,7 +4409,7 @@ testStoragePoolGetAutostart(virStoragePoolPtr pool, testDriverUnlock(privconn); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -4438,13 +4439,13 @@ testStoragePoolSetAutostart(virStoragePoolPtr pool, testDriverUnlock(privconn); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (!privpool->configFile) { - testError(VIR_ERR_INVALID_ARG, - "%s", _("pool has no config file")); + virReportError(VIR_ERR_INVALID_ARG, + "%s", _("pool has no config file")); goto cleanup; } @@ -4471,13 +4472,13 @@ testStoragePoolNumVolumes(virStoragePoolPtr pool) { testDriverUnlock(privconn); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), pool->name); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), pool->name); goto cleanup; } @@ -4505,14 +4506,14 @@ testStoragePoolListVolumes(virStoragePoolPtr pool, testDriverUnlock(privconn); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), pool->name); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), pool->name); goto cleanup; } @@ -4551,22 +4552,22 @@ testStorageVolumeLookupByName(virStoragePoolPtr pool, testDriverUnlock(privconn); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), pool->name); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), pool->name); goto cleanup; } privvol = virStorageVolDefFindByName(privpool, name); if (!privvol) { - testError(VIR_ERR_NO_STORAGE_VOL, - _("no storage vol with matching name '%s'"), name); + virReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching name '%s'"), name); goto cleanup; } @@ -4608,8 +4609,8 @@ testStorageVolumeLookupByKey(virConnectPtr conn, testDriverUnlock(privconn); if (!ret) - testError(VIR_ERR_NO_STORAGE_VOL, - _("no storage vol with matching key '%s'"), key); + virReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching key '%s'"), key); return ret; } @@ -4642,8 +4643,8 @@ testStorageVolumeLookupByPath(virConnectPtr conn, testDriverUnlock(privconn); if (!ret) - testError(VIR_ERR_NO_STORAGE_VOL, - _("no storage vol with matching path '%s'"), path); + virReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching path '%s'"), path); return ret; } @@ -4666,13 +4667,13 @@ testStorageVolumeCreateXML(virStoragePoolPtr pool, testDriverUnlock(privconn); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), pool->name); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), pool->name); goto cleanup; } @@ -4681,17 +4682,17 @@ testStorageVolumeCreateXML(virStoragePoolPtr pool, goto cleanup; if (virStorageVolDefFindByName(privpool, privvol->name)) { - testError(VIR_ERR_OPERATION_FAILED, - "%s", _("storage vol already exists")); + virReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("storage vol already exists")); goto cleanup; } /* Make sure enough space */ if ((privpool->def->allocation + privvol->allocation) > privpool->def->capacity) { - testError(VIR_ERR_INTERNAL_ERROR, - _("Not enough free space in pool for volume '%s'"), - privvol->name); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Not enough free space in pool for volume '%s'"), + privvol->name); goto cleanup; } @@ -4750,13 +4751,13 @@ testStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, testDriverUnlock(privconn); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), pool->name); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), pool->name); goto cleanup; } @@ -4765,25 +4766,25 @@ testStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, goto cleanup; if (virStorageVolDefFindByName(privpool, privvol->name)) { - testError(VIR_ERR_OPERATION_FAILED, - "%s", _("storage vol already exists")); + virReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("storage vol already exists")); goto cleanup; } origvol = virStorageVolDefFindByName(privpool, clonevol->name); if (!origvol) { - testError(VIR_ERR_NO_STORAGE_VOL, - _("no storage vol with matching name '%s'"), - clonevol->name); + virReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching name '%s'"), + clonevol->name); goto cleanup; } /* Make sure enough space */ if ((privpool->def->allocation + privvol->allocation) > privpool->def->capacity) { - testError(VIR_ERR_INTERNAL_ERROR, - _("Not enough free space in pool for volume '%s'"), - privvol->name); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Not enough free space in pool for volume '%s'"), + privvol->name); goto cleanup; } privpool->def->available = (privpool->def->capacity - @@ -4843,7 +4844,7 @@ testStorageVolumeDelete(virStorageVolPtr vol, testDriverUnlock(privconn); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } @@ -4851,15 +4852,15 @@ testStorageVolumeDelete(virStorageVolPtr vol, privvol = virStorageVolDefFindByName(privpool, vol->name); if (privvol == NULL) { - testError(VIR_ERR_NO_STORAGE_VOL, - _("no storage vol with matching name '%s'"), - vol->name); + virReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching name '%s'"), + vol->name); goto cleanup; } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), vol->pool); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), vol->pool); goto cleanup; } @@ -4922,22 +4923,22 @@ testStorageVolumeGetInfo(virStorageVolPtr vol, testDriverUnlock(privconn); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } privvol = virStorageVolDefFindByName(privpool, vol->name); if (privvol == NULL) { - testError(VIR_ERR_NO_STORAGE_VOL, - _("no storage vol with matching name '%s'"), - vol->name); + virReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching name '%s'"), + vol->name); goto cleanup; } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), vol->pool); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), vol->pool); goto cleanup; } @@ -4970,22 +4971,22 @@ testStorageVolumeGetXMLDesc(virStorageVolPtr vol, testDriverUnlock(privconn); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } privvol = virStorageVolDefFindByName(privpool, vol->name); if (privvol == NULL) { - testError(VIR_ERR_NO_STORAGE_VOL, - _("no storage vol with matching name '%s'"), - vol->name); + virReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching name '%s'"), + vol->name); goto cleanup; } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), vol->pool); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), vol->pool); goto cleanup; } @@ -5010,22 +5011,22 @@ testStorageVolumeGetPath(virStorageVolPtr vol) { testDriverUnlock(privconn); if (privpool == NULL) { - testError(VIR_ERR_INVALID_ARG, __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto cleanup; } privvol = virStorageVolDefFindByName(privpool, vol->name); if (privvol == NULL) { - testError(VIR_ERR_NO_STORAGE_VOL, - _("no storage vol with matching name '%s'"), - vol->name); + virReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching name '%s'"), + vol->name); goto cleanup; } if (!virStoragePoolObjIsActive(privpool)) { - testError(VIR_ERR_OPERATION_INVALID, - _("storage pool '%s' is not active"), vol->pool); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), vol->pool); goto cleanup; } @@ -5129,7 +5130,7 @@ testNodeDeviceLookupByName(virConnectPtr conn, const char *name) testDriverUnlock(driver); if (!obj) { - testError(VIR_ERR_NO_NODE_DEVICE, NULL); + virReportError(VIR_ERR_NO_NODE_DEVICE, NULL); goto cleanup; } @@ -5156,9 +5157,9 @@ testNodeDeviceGetXMLDesc(virNodeDevicePtr dev, testDriverUnlock(driver); if (!obj) { - testError(VIR_ERR_NO_NODE_DEVICE, - _("no node device with matching name '%s'"), - dev->name); + virReportError(VIR_ERR_NO_NODE_DEVICE, + _("no node device with matching name '%s'"), + dev->name); goto cleanup; } @@ -5182,9 +5183,9 @@ testNodeDeviceGetParent(virNodeDevicePtr dev) testDriverUnlock(driver); if (!obj) { - testError(VIR_ERR_NO_NODE_DEVICE, - _("no node device with matching name '%s'"), - dev->name); + virReportError(VIR_ERR_NO_NODE_DEVICE, + _("no node device with matching name '%s'"), + dev->name); goto cleanup; } @@ -5193,8 +5194,8 @@ testNodeDeviceGetParent(virNodeDevicePtr dev) if (!ret) virReportOOMError(); } else { - testError(VIR_ERR_INTERNAL_ERROR, - "%s", _("no parent for this device")); + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("no parent for this device")); } cleanup: @@ -5218,9 +5219,9 @@ testNodeDeviceNumOfCaps(virNodeDevicePtr dev) testDriverUnlock(driver); if (!obj) { - testError(VIR_ERR_NO_NODE_DEVICE, - _("no node device with matching name '%s'"), - dev->name); + virReportError(VIR_ERR_NO_NODE_DEVICE, + _("no node device with matching name '%s'"), + dev->name); goto cleanup; } @@ -5249,9 +5250,9 @@ testNodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames) testDriverUnlock(driver); if (!obj) { - testError(VIR_ERR_NO_NODE_DEVICE, - _("no node device with matching name '%s'"), - dev->name); + virReportError(VIR_ERR_NO_NODE_DEVICE, + _("no node device with matching name '%s'"), + dev->name); goto cleanup; } @@ -5356,7 +5357,7 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) testDriverUnlock(driver); if (!obj) { - testError(VIR_ERR_NO_NODE_DEVICE, NULL); + virReportError(VIR_ERR_NO_NODE_DEVICE, NULL); goto out; } -- 1.7.10.4