External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 09:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu_map: Use g_auto* in loadIncludes

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Tim Wiederhake 2020-09-07 16:58:54 +02:00 committed by Ján Tomko
parent 6d1c458346
commit e8d40cc3be
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/cpu/cpu_map.c
View File

@ -121,37 +121,31 @@ loadIncludes(xmlXPathContextPtr ctxt,
cpuMapLoadCallback modelCB, cpuMapLoadCallback modelCB,
void *data) void *data)
{ {
int ret = -1;
VIR_XPATH_NODE_AUTORESTORE(ctxt) VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr *nodes = NULL; g_autofree xmlNodePtr *nodes = NULL;
int n; int n;
size_t i; size_t i;
n = virXPathNodeSet("include", ctxt, &nodes); n = virXPathNodeSet("include", ctxt, &nodes);
if (n < 0) if (n < 0)
goto cleanup; return -1;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
char *filename = virXMLPropString(nodes[i], "filename"); char *filename = virXMLPropString(nodes[i], "filename");
if (!filename) { if (!filename) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Missing 'filename' in CPU map include")); _("Missing 'filename' in CPU map include"));
goto cleanup; return -1;
} }
VIR_DEBUG("Finding CPU map include '%s'", filename); VIR_DEBUG("Finding CPU map include '%s'", filename);
if (cpuMapLoadInclude(filename, vendorCB, featureCB, modelCB, data) < 0) { if (cpuMapLoadInclude(filename, vendorCB, featureCB, modelCB, data) < 0) {
VIR_FREE(filename); VIR_FREE(filename);
goto cleanup; return -1;
} }
VIR_FREE(filename); VIR_FREE(filename);
} }
ret = 0; return 0;
cleanup:
VIR_FREE(nodes);
return ret;
} }