Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt

体验新版 GitCode，发现更多精彩内容 >>

提交 0e88cf2a 编写于 作者: M Michal Privoznik
浏览文件
操作

Adapt to VIR_ALLOC and virAsprintf in src/test/*

上级 ca702bf5
显示空白变更内容
内联 并排
Showing with 28 addition and 63 deletion
src/test/test_driver.c
浏览文件 @ 0e88cf2a
...@@ -170,18 +170,18 @@ testBuildCapabilities(virConnectPtr conn) { ...@@ -170,18 +170,18 @@ testBuildCapabilities(virConnectPtr conn) {
int i; int i;
if ((caps = virCapabilitiesNew(VIR_ARCH_I686, 0, 0)) == NULL) if ((caps = virCapabilitiesNew(VIR_ARCH_I686, 0, 0)) == NULL)
goto no_memory; goto error;
if (virCapabilitiesAddHostFeature(caps, "pae") < 0) if (virCapabilitiesAddHostFeature(caps, "pae") < 0)
goto no_memory; goto error;
if (virCapabilitiesAddHostFeature(caps ,"nonpae") < 0) if (virCapabilitiesAddHostFeature(caps ,"nonpae") < 0)
goto no_memory; goto error;
for (i = 0; i < privconn->numCells; i++) { for (i = 0; i < privconn->numCells; i++) {
virCapsHostNUMACellCPUPtr cpu_cells; virCapsHostNUMACellCPUPtr cpu_cells;
if (VIR_ALLOC_N(cpu_cells, privconn->cells[i].numCpus) < 0) if (VIR_ALLOC_N(cpu_cells, privconn->cells[i].numCpus) < 0)
goto no_memory; goto error;
memcpy(cpu_cells, privconn->cells[i].cpus, memcpy(cpu_cells, privconn->cells[i].cpus,
sizeof(*cpu_cells) * privconn->cells[i].numCpus); sizeof(*cpu_cells) * privconn->cells[i].numCpus);
...@@ -189,7 +189,7 @@ testBuildCapabilities(virConnectPtr conn) { ...@@ -189,7 +189,7 @@ testBuildCapabilities(virConnectPtr conn) {
if (virCapabilitiesAddHostNUMACell(caps, i, privconn->cells[i].numCpus, if (virCapabilitiesAddHostNUMACell(caps, i, privconn->cells[i].numCpus,
0, cpu_cells) < 0) 0, cpu_cells) < 0)
goto no_memory; goto error;
} }
for (i = 0; i < ARRAY_CARDINALITY(guest_types); i++) { for (i = 0; i < ARRAY_CARDINALITY(guest_types); i++) {
...@@ -200,7 +200,7 @@ testBuildCapabilities(virConnectPtr conn) { ...@@ -200,7 +200,7 @@ testBuildCapabilities(virConnectPtr conn) {
NULL, NULL,
0, 0,
NULL)) == NULL) NULL)) == NULL)
goto no_memory; goto error;
if (virCapabilitiesAddGuestDomain(guest, if (virCapabilitiesAddGuestDomain(guest,
"test", "test",
...@@ -208,17 +208,17 @@ testBuildCapabilities(virConnectPtr conn) { ...@@ -208,17 +208,17 @@ testBuildCapabilities(virConnectPtr conn) {
NULL, NULL,
0, 0,
NULL) == NULL) NULL) == NULL)
goto no_memory; goto error;
if (virCapabilitiesAddGuestFeature(guest, "pae", 1, 1) == NULL) if (virCapabilitiesAddGuestFeature(guest, "pae", 1, 1) == NULL)
goto no_memory; goto error;
if (virCapabilitiesAddGuestFeature(guest ,"nonpae", 1, 1) == NULL) if (virCapabilitiesAddGuestFeature(guest ,"nonpae", 1, 1) == NULL)
goto no_memory; goto error;
} }
caps->host.nsecModels = 1; caps->host.nsecModels = 1;
if (VIR_ALLOC_N(caps->host.secModels, caps->host.nsecModels) < 0) if (VIR_ALLOC_N(caps->host.secModels, caps->host.nsecModels) < 0)
goto no_memory; goto error;
if (VIR_STRDUP(caps->host.secModels[0].model, "testSecurity") < 0) if (VIR_STRDUP(caps->host.secModels[0].model, "testSecurity") < 0)
goto error; goto error;
...@@ -227,8 +227,6 @@ testBuildCapabilities(virConnectPtr conn) { ...@@ -227,8 +227,6 @@ testBuildCapabilities(virConnectPtr conn) {
return caps; return caps;
no_memory:
virReportOOMError();
error: error:
virObjectUnref(caps); virObjectUnref(caps);
return NULL; return NULL;
...@@ -337,10 +335,8 @@ testDomainGenerateIfname(virDomainDefPtr domdef) { ...@@ -337,10 +335,8 @@ testDomainGenerateIfname(virDomainDefPtr domdef) {
char *ifname; char *ifname;
int found = 0; int found = 0;
if (virAsprintf(&ifname, "testnet%d", ifctr) < 0) { if (virAsprintf(&ifname, "testnet%d", ifctr) < 0)
virReportOOMError();
return NULL; return NULL;
}
/* Generate network interface names */ /* Generate network interface names */
for (i = 0; i < domdef->nnets; i++) { for (i = 0; i < domdef->nnets; i++) {
...@@ -446,15 +442,11 @@ testDomainUpdateVCPUs(virConnectPtr conn, ...@@ -446,15 +442,11 @@ testDomainUpdateVCPUs(virConnectPtr conn,
maxcpu = VIR_NODEINFO_MAXCPUS(privconn->nodeInfo); maxcpu = VIR_NODEINFO_MAXCPUS(privconn->nodeInfo);
cpumaplen = VIR_CPU_MAPLEN(maxcpu); cpumaplen = VIR_CPU_MAPLEN(maxcpu);
if (VIR_REALLOC_N(privdata->vcpu_infos, nvcpus) < 0) { if (VIR_REALLOC_N(privdata->vcpu_infos, nvcpus) < 0)
virReportOOMError();
goto cleanup; goto cleanup;
}
if (VIR_REALLOC_N(privdata->cpumaps, nvcpus * cpumaplen) < 0) { if (VIR_REALLOC_N(privdata->cpumaps, nvcpus * cpumaplen) < 0)
virReportOOMError();
goto cleanup; goto cleanup;
}
/* Set running VCPU and cpumap state */ /* Set running VCPU and cpumap state */
if (clear_all) { if (clear_all) {
...@@ -534,10 +526,8 @@ static int testOpenDefault(virConnectPtr conn) { ...@@ -534,10 +526,8 @@ static int testOpenDefault(virConnectPtr conn) {
virNodeDeviceDefPtr nodedef = NULL; virNodeDeviceDefPtr nodedef = NULL;
virNodeDeviceObjPtr nodeobj = NULL; virNodeDeviceObjPtr nodeobj = NULL;
if (VIR_ALLOC(privconn) < 0) { if (VIR_ALLOC(privconn) < 0)
virReportOOMError();
return VIR_DRV_OPEN_ERROR; return VIR_DRV_OPEN_ERROR;
}
if (virMutexInit(&privconn->lock) < 0) { if (virMutexInit(&privconn->lock) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("cannot initialize mutex")); "%s", _("cannot initialize mutex"));
...@@ -561,10 +551,8 @@ static int testOpenDefault(virConnectPtr conn) { ...@@ -561,10 +551,8 @@ static int testOpenDefault(virConnectPtr conn) {
} }
for (u = 0; u < 16; u++) { for (u = 0; u < 16; u++) {
virBitmapPtr siblings = virBitmapNew(16); virBitmapPtr siblings = virBitmapNew(16);
if (!siblings) { if (!siblings)
virReportOOMError();
goto error; goto error;
}
ignore_value(virBitmapSetBit(siblings, u)); ignore_value(virBitmapSetBit(siblings, u));
privconn->cells[u / 8].cpus[(u % 8)].id = u; privconn->cells[u / 8].cpus[(u % 8)].id = u;
privconn->cells[u / 8].cpus[(u % 8)].socket_id = u / 8; privconn->cells[u / 8].cpus[(u % 8)].socket_id = u / 8;
...@@ -710,10 +698,8 @@ static int testOpenVolumesForPool(xmlDocPtr xml, ...@@ -710,10 +698,8 @@ static int testOpenVolumesForPool(xmlDocPtr xml,
virStorageVolDefPtr def = NULL; virStorageVolDefPtr def = NULL;
/* Find storage volumes */ /* Find storage volumes */
if (virAsprintf(&vol_xpath, "/node/pool[%d]/volume", poolidx) < 0) { if (virAsprintf(&vol_xpath, "/node/pool[%d]/volume", poolidx) < 0)
virReportOOMError();
goto error; goto error;
}
ret = virXPathNodeSet(vol_xpath, ctxt, &vols); ret = virXPathNodeSet(vol_xpath, ctxt, &vols);
VIR_FREE(vol_xpath); VIR_FREE(vol_xpath);
...@@ -744,19 +730,15 @@ static int testOpenVolumesForPool(xmlDocPtr xml, ...@@ -744,19 +730,15 @@ static int testOpenVolumesForPool(xmlDocPtr xml,
} }
if (VIR_REALLOC_N(pool->volumes.objs, if (VIR_REALLOC_N(pool->volumes.objs,
pool->volumes.count+1) < 0) { pool->volumes.count+1) < 0)
virReportOOMError();
goto error; goto error;
}
if (def->target.path == NULL) { if (def->target.path == NULL) {
if (virAsprintf(&def->target.path, "%s/%s", if (virAsprintf(&def->target.path, "%s/%s",
pool->def->target.path, pool->def->target.path,
def->name) == -1) { def->name) == -1)
virReportOOMError();
goto error; goto error;
} }
}
if (!def->key && VIR_STRDUP(def->key, def->target.path) < 0) if (!def->key && VIR_STRDUP(def->key, def->target.path) < 0)
goto error; goto error;
...@@ -790,10 +772,8 @@ static int testOpenFromFile(virConnectPtr conn, ...@@ -790,10 +772,8 @@ static int testOpenFromFile(virConnectPtr conn,
virInterfaceObjPtr iface; virInterfaceObjPtr iface;
virDomainObjPtr dom; virDomainObjPtr dom;
testConnPtr privconn; testConnPtr privconn;
if (VIR_ALLOC(privconn) < 0) { if (VIR_ALLOC(privconn) < 0)
virReportOOMError();
return VIR_DRV_OPEN_ERROR; return VIR_DRV_OPEN_ERROR;
}
if (virMutexInit(&privconn->lock) < 0) { if (virMutexInit(&privconn->lock) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("cannot initialize mutex")); "%s", _("cannot initialize mutex"));
...@@ -1944,10 +1924,8 @@ testDomainRestoreFlags(virConnectPtr conn, ...@@ -1944,10 +1924,8 @@ testDomainRestoreFlags(virConnectPtr conn,
"%s", _("length of metadata out of range")); "%s", _("length of metadata out of range"));
goto cleanup; goto cleanup;
} }
if (VIR_ALLOC_N(xml, len+1) < 0) { if (VIR_ALLOC_N(xml, len+1) < 0)
virReportOOMError();
goto cleanup; goto cleanup;
}
if (saferead(fd, xml, len) != len) { if (saferead(fd, xml, len) != len) {
virReportSystemError(errno, virReportSystemError(errno,
_("incomplete metdata in '%s'"), path); _("incomplete metdata in '%s'"), path);
...@@ -4176,9 +4154,8 @@ testConnectFindStoragePoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -4176,9 +4154,8 @@ testConnectFindStoragePoolSources(virConnectPtr conn ATTRIBUTE_UNUSED,
goto cleanup; goto cleanup;
} }
if (virAsprintf(&ret, defaultPoolSourcesNetFSXML, ignore_value(virAsprintf(&ret, defaultPoolSourcesNetFSXML,
source->hosts[0].name) < 0) source->hosts[0].name));
virReportOOMError();
break; break;
default: default:
...@@ -4687,10 +4664,8 @@ testStoragePoolListAllVolumes(virStoragePoolPtr obj, ...@@ -4687,10 +4664,8 @@ testStoragePoolListAllVolumes(virStoragePoolPtr obj,
goto cleanup; goto cleanup;
} }
if (VIR_ALLOC_N(tmp_vols, pool->volumes.count + 1) < 0) { if (VIR_ALLOC_N(tmp_vols, pool->volumes.count + 1) < 0)
virReportOOMError();
goto cleanup; goto cleanup;
}
for (i = 0; i < pool->volumes.count; i++) { for (i = 0; i < pool->volumes.count; i++) {
if (!(vol = virGetStorageVol(obj->conn, pool->def->name, if (!(vol = virGetStorageVol(obj->conn, pool->def->name,
...@@ -4882,17 +4857,13 @@ testStorageVolCreateXML(virStoragePoolPtr pool, ...@@ -4882,17 +4857,13 @@ testStorageVolCreateXML(virStoragePoolPtr pool,
} }
if (VIR_REALLOC_N(privpool->volumes.objs, if (VIR_REALLOC_N(privpool->volumes.objs,
privpool->volumes.count+1) < 0) { privpool->volumes.count+1) < 0)
virReportOOMError();
goto cleanup; goto cleanup;
}
if (virAsprintf(&privvol->target.path, "%s/%s", if (virAsprintf(&privvol->target.path, "%s/%s",
privpool->def->target.path, privpool->def->target.path,
privvol->name) == -1) { privvol->name) == -1)
virReportOOMError();
goto cleanup; goto cleanup;
}
if (VIR_STRDUP(privvol->key, privvol->target.path) < 0) if (VIR_STRDUP(privvol->key, privvol->target.path) < 0)
goto cleanup; goto cleanup;
...@@ -4974,17 +4945,13 @@ testStorageVolCreateXMLFrom(virStoragePoolPtr pool, ...@@ -4974,17 +4945,13 @@ testStorageVolCreateXMLFrom(virStoragePoolPtr pool,
privpool->def->allocation); privpool->def->allocation);
if (VIR_REALLOC_N(privpool->volumes.objs, if (VIR_REALLOC_N(privpool->volumes.objs,
privpool->volumes.count+1) < 0) { privpool->volumes.count+1) < 0)
virReportOOMError();
goto cleanup; goto cleanup;
}
if (virAsprintf(&privvol->target.path, "%s/%s", if (virAsprintf(&privvol->target.path, "%s/%s",
privpool->def->target.path, privpool->def->target.path,
privvol->name) == -1) { privvol->name) == -1)
virReportOOMError();
goto cleanup; goto cleanup;
}
if (VIR_STRDUP(privvol->key, privvol->target.path) < 0) if (VIR_STRDUP(privvol->key, privvol->target.path) < 0)
goto cleanup; goto cleanup;
...@@ -5721,10 +5688,8 @@ testNodeGetCPUMap(virConnectPtr conn, ...@@ -5721,10 +5688,8 @@ testNodeGetCPUMap(virConnectPtr conn,
testDriverLock(privconn); testDriverLock(privconn);
if (cpumap) { if (cpumap) {
if (VIR_ALLOC_N(*cpumap, 1) < 0) { if (VIR_ALLOC_N(*cpumap, 1) < 0)
virReportOOMError();
goto cleanup; goto cleanup;
}
*cpumap[0] = 0x15; *cpumap[0] = 0x15;
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或