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

cpu_map: Use g_auto* in cpuMapLoadInclude 

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:53 +02:00 committed by Ján Tomko
parent a490693367
commit 6d1c458346
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/cpu/cpu_map.c
View File

@ -85,10 +85,9 @@ cpuMapLoadInclude(const char *filename,
cpuMapLoadCallback modelCB,
void *data)
{
xmlDocPtr xml = NULL;
xmlXPathContextPtr ctxt = NULL;
int ret = -1;
char *mapfile;
g_autoptr(xmlDoc) xml = NULL;
g_autoptr(xmlXPathContext) ctxt = NULL;
g_autofree char *mapfile = NULL;
if (!(mapfile = virFileFindResource(filename,
abs_top_srcdir "/src/cpu_map",
@ -98,27 +97,20 @@ cpuMapLoadInclude(const char *filename,
VIR_DEBUG("Loading CPU map include from %s", mapfile);
if (!(xml = virXMLParseFileCtxt(mapfile, &ctxt)))
goto cleanup;
return -1;
ctxt->node = xmlDocGetRootElement(xml);
if (loadData(mapfile, ctxt, "vendor", vendorCB, data) < 0)
goto cleanup;
return -1;
if (loadData(mapfile, ctxt, "feature", featureCB, data) < 0)
goto cleanup;
return -1;
if (loadData(mapfile, ctxt, "model", modelCB, data) < 0)
goto cleanup;
return -1;
ret = 0;
cleanup:
xmlXPathFreeContext(ctxt);
xmlFreeDoc(xml);
VIR_FREE(mapfile);
return ret;
return 0;
}