External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-15 17:15:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: code cleanup for return error code directly

Browse Source 
code cleanup for 'virDomainCachetuneDefParse' and
'virDomainMemorytuneDefParse'.

Signed-off-by: Wang Huaqiang <huaqiang.wang@intel.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Wang Huaqiang 2019-06-11 11:31:08 +08:00 committed by Michal Privoznik
parent 53c87fb920
commit 48e188d2a8
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/conf/domain_conf.c
View File

@ -19374,40 +19374,38 @@ virDomainCachetuneDefParse(virDomainDefPtr def,
ctxt->node = node; ctxt->node = node;
if (virDomainResctrlParseVcpus(def, node, &vcpus) < 0) if (virDomainResctrlParseVcpus(def, node, &vcpus) < 0)
goto cleanup; return -1;
if (virBitmapIsAllClear(vcpus)) { if (virBitmapIsAllClear(vcpus))
ret = 0; return 0;
goto cleanup;
}
if ((n = virXPathNodeSet("./cache", ctxt, &nodes)) < 0) { if ((n = virXPathNodeSet("./cache", ctxt, &nodes)) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Cannot extract cache nodes under cachetune")); _("Cannot extract cache nodes under cachetune"));
goto cleanup; return -1;
} }
if (virDomainResctrlVcpuMatch(def, vcpus, &alloc) < 0) if (virDomainResctrlVcpuMatch(def, vcpus, &alloc) < 0)
goto cleanup; return -1;
if (!alloc) { if (!alloc) {
alloc = virResctrlAllocNew(); alloc = virResctrlAllocNew();
if (!alloc) if (!alloc)
goto cleanup; return -1;
} else { } else {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("Identical vcpus in cachetunes found")); _("Identical vcpus in cachetunes found"));
goto cleanup; return -1;
} }
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (virDomainCachetuneDefParseCache(ctxt, nodes[i], alloc) < 0) if (virDomainCachetuneDefParseCache(ctxt, nodes[i], alloc) < 0)
goto cleanup; return -1;
} }
resctrl = virDomainResctrlNew(node, alloc, vcpus, flags); resctrl = virDomainResctrlNew(node, alloc, vcpus, flags);
if (!resctrl) if (!resctrl)
goto cleanup; return -1;
if (virDomainResctrlMonDefParse(def, ctxt, node, if (virDomainResctrlMonDefParse(def, ctxt, node,
VIR_RESCTRL_MONITOR_TYPE_CACHE, VIR_RESCTRL_MONITOR_TYPE_CACHE,
@ -19580,37 +19578,35 @@ virDomainMemorytuneDefParse(virDomainDefPtr def,
ctxt->node = node; ctxt->node = node;
if (virDomainResctrlParseVcpus(def, node, &vcpus) < 0) if (virDomainResctrlParseVcpus(def, node, &vcpus) < 0)
goto cleanup; return -1;
if (virBitmapIsAllClear(vcpus)) { if (virBitmapIsAllClear(vcpus))
ret = 0; return 0;
goto cleanup;
}
if ((n = virXPathNodeSet("./node", ctxt, &nodes)) < 0) { if ((n = virXPathNodeSet("./node", ctxt, &nodes)) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Cannot extract memory nodes under memorytune")); _("Cannot extract memory nodes under memorytune"));
goto cleanup; return -1;
} }
if (virDomainResctrlVcpuMatch(def, vcpus, &alloc) < 0) if (virDomainResctrlVcpuMatch(def, vcpus, &alloc) < 0)
goto cleanup; return -1;
if (!alloc) { if (!alloc) {
alloc = virResctrlAllocNew(); alloc = virResctrlAllocNew();
if (!alloc) if (!alloc)
goto cleanup; return -1;
new_alloc = true; new_alloc = true;
} }
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (virDomainMemorytuneDefParseMemory(ctxt, nodes[i], alloc) < 0) if (virDomainMemorytuneDefParseMemory(ctxt, nodes[i], alloc) < 0)
goto cleanup; return -1;
}
if (virResctrlAllocIsEmpty(alloc)) {
ret = 0;
goto cleanup;
} }
if (virResctrlAllocIsEmpty(alloc))
return 0;
/* /*
* If this is a new allocation, format ID and append to resctrl, otherwise * If this is a new allocation, format ID and append to resctrl, otherwise
* just update the existing alloc information, which is done in above * just update the existing alloc information, which is done in above
@ -19618,7 +19614,7 @@ virDomainMemorytuneDefParse(virDomainDefPtr def,
if (new_alloc) { if (new_alloc) {
resctrl = virDomainResctrlNew(node, alloc, vcpus, flags); resctrl = virDomainResctrlNew(node, alloc, vcpus, flags);
if (!resctrl) if (!resctrl)
goto cleanup; return -1;
if (VIR_APPEND_ELEMENT(def->resctrls, def->nresctrls, resctrl) < 0) if (VIR_APPEND_ELEMENT(def->resctrls, def->nresctrls, resctrl) < 0)
goto cleanup; goto cleanup;