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

tests: libxl: use g_autofree

Browse Source 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
This commit is contained in:
Ján Tomko 2021-09-04 22:36:12 +02:00
parent e062566885
commit df7116d1b0
3 changed files with 18 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/libxlxml2domconfigtest.c
View File

@ -53,9 +53,9 @@ testCompareXMLToDomConfig(const char *xmlfile,
xentoollog_logger *log = NULL; xentoollog_logger *log = NULL;
virPortAllocatorRange *gports = NULL; virPortAllocatorRange *gports = NULL;
virDomainDef *vmdef = NULL; virDomainDef *vmdef = NULL;
char *actualjson = NULL; g_autofree char *actualjson = NULL;
char *tempjson = NULL; g_autofree char *tempjson = NULL;
char *expectjson = NULL; g_autofree char *expectjson = NULL;
g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver); g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver);
libxl_domain_config_init(&actualconfig); libxl_domain_config_init(&actualconfig);
@ -128,9 +128,6 @@ testCompareXMLToDomConfig(const char *xmlfile,
vmdef->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) vmdef->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC)
virPortAllocatorRelease(vmdef->graphics[0]->data.vnc.port); virPortAllocatorRelease(vmdef->graphics[0]->data.vnc.port);
VIR_FREE(expectjson);
VIR_FREE(actualjson);
VIR_FREE(tempjson);
virDomainDefFree(vmdef); virDomainDefFree(vmdef);
virPortAllocatorRangeFree(gports); virPortAllocatorRangeFree(gports);
libxl_domain_config_dispose(&actualconfig); libxl_domain_config_dispose(&actualconfig);
@ -150,16 +147,14 @@ testCompareXMLToDomConfigHelper(const void *data)
{ {
int ret = -1; int ret = -1;
const struct testInfo *info = data; const struct testInfo *info = data;
char *xmlfile = NULL; g_autofree char *xmlfile = NULL;
char *jsonfile = NULL; g_autofree char *jsonfile = NULL;
xmlfile = g_strdup_printf("%s/libxlxml2domconfigdata/%s.xml", abs_srcdir, info->name); xmlfile = g_strdup_printf("%s/libxlxml2domconfigdata/%s.xml", abs_srcdir, info->name);
jsonfile = g_strdup_printf("%s/libxlxml2domconfigdata/%s.json", abs_srcdir, info->name); jsonfile = g_strdup_printf("%s/libxlxml2domconfigdata/%s.json", abs_srcdir, info->name);
ret = testCompareXMLToDomConfig(xmlfile, jsonfile); ret = testCompareXMLToDomConfig(xmlfile, jsonfile);
VIR_FREE(xmlfile);
VIR_FREE(jsonfile);
return ret; return ret;
} }

25
tests/xlconfigtest.c
View File

@ -45,7 +45,7 @@ static libxlDriverPrivate *driver;
static char * static char *
testReplaceVarsXML(const char *xml) testReplaceVarsXML(const char *xml)
{ {
char *xmlcfgData; g_autofree char *xmlcfgData = NULL;
char *replacedXML; char *replacedXML;
if (virTestLoadFile(xml, &xmlcfgData) < 0) if (virTestLoadFile(xml, &xmlcfgData) < 0)
@ -54,7 +54,6 @@ testReplaceVarsXML(const char *xml)
replacedXML = virStringReplace(xmlcfgData, "/LIBXL_FIRMWARE_DIR", replacedXML = virStringReplace(xmlcfgData, "/LIBXL_FIRMWARE_DIR",
LIBXL_FIRMWARE_DIR); LIBXL_FIRMWARE_DIR);
VIR_FREE(xmlcfgData);
return replacedXML; return replacedXML;
} }
@ -65,13 +64,13 @@ testReplaceVarsXML(const char *xml)
static int static int
testCompareParseXML(const char *xlcfg, const char *xml, bool replaceVars) testCompareParseXML(const char *xlcfg, const char *xml, bool replaceVars)
{ {
char *gotxlcfgData = NULL; g_autofree char *gotxlcfgData = NULL;
g_autoptr(virConf) conf = NULL; g_autoptr(virConf) conf = NULL;
g_autoptr(virConnect) conn = NULL; g_autoptr(virConnect) conn = NULL;
int wrote = 4096; int wrote = 4096;
int ret = -1; int ret = -1;
virDomainDef *def = NULL; virDomainDef *def = NULL;
char *replacedXML = NULL; g_autofree char *replacedXML = NULL;
gotxlcfgData = g_new0(char, wrote); gotxlcfgData = g_new0(char, wrote);
@ -108,8 +107,6 @@ testCompareParseXML(const char *xlcfg, const char *xml, bool replaceVars)
ret = 0; ret = 0;
fail: fail:
VIR_FREE(replacedXML);
VIR_FREE(gotxlcfgData);
virDomainDefFree(def); virDomainDefFree(def);
return ret; return ret;
@ -122,13 +119,13 @@ testCompareParseXML(const char *xlcfg, const char *xml, bool replaceVars)
static int static int
testCompareFormatXML(const char *xlcfg, const char *xml, bool replaceVars) testCompareFormatXML(const char *xlcfg, const char *xml, bool replaceVars)
{ {
char *xlcfgData = NULL; g_autofree char *xlcfgData = NULL;
char *gotxml = NULL; g_autofree char *gotxml = NULL;
g_autoptr(virConf) conf = NULL; g_autoptr(virConf) conf = NULL;
int ret = -1; int ret = -1;
g_autoptr(virConnect) conn = NULL; g_autoptr(virConnect) conn = NULL;
virDomainDef *def = NULL; virDomainDef *def = NULL;
char *replacedXML = NULL; g_autofree char *replacedXML = NULL;
g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver); g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver);
conn = virGetConnect(); conn = virGetConnect();
@ -161,9 +158,6 @@ testCompareFormatXML(const char *xlcfg, const char *xml, bool replaceVars)
ret = 0; ret = 0;
fail: fail:
VIR_FREE(replacedXML);
VIR_FREE(xlcfgData);
VIR_FREE(gotxml);
virDomainDefFree(def); virDomainDefFree(def);
return ret; return ret;
@ -181,8 +175,8 @@ testCompareHelper(const void *data)
{ {
int result = -1; int result = -1;
const struct testInfo *info = data; const struct testInfo *info = data;
char *xml = NULL; g_autofree char *xml = NULL;
char *cfg = NULL; g_autofree char *cfg = NULL;
xml = g_strdup_printf("%s/xlconfigdata/test-%s.xml", abs_srcdir, info->name); xml = g_strdup_printf("%s/xlconfigdata/test-%s.xml", abs_srcdir, info->name);
cfg = g_strdup_printf("%s/xlconfigdata/test-%s.cfg", abs_srcdir, info->name); cfg = g_strdup_printf("%s/xlconfigdata/test-%s.cfg", abs_srcdir, info->name);
@ -192,9 +186,6 @@ testCompareHelper(const void *data)
else else
result = testCompareFormatXML(cfg, xml, info->replaceVars); result = testCompareFormatXML(cfg, xml, info->replaceVars);
VIR_FREE(xml);
VIR_FREE(cfg);
return result; return result;
} }

16
tests/xmconfigtest.c
View File

@ -39,7 +39,7 @@ static libxlDriverPrivate *driver;
static int static int
testCompareParseXML(const char *xmcfg, const char *xml) testCompareParseXML(const char *xmcfg, const char *xml)
{ {
char *gotxmcfgData = NULL; g_autofree char *gotxmcfgData = NULL;
g_autoptr(virConf) conf = NULL; g_autoptr(virConf) conf = NULL;
int ret = -1; int ret = -1;
g_autoptr(virConnect) conn = NULL; g_autoptr(virConnect) conn = NULL;
@ -73,7 +73,6 @@ testCompareParseXML(const char *xmcfg, const char *xml)
ret = 0; ret = 0;
fail: fail:
VIR_FREE(gotxmcfgData);
virDomainDefFree(def); virDomainDefFree(def);
return ret; return ret;
@ -82,8 +81,8 @@ testCompareParseXML(const char *xmcfg, const char *xml)
static int static int
testCompareFormatXML(const char *xmcfg, const char *xml) testCompareFormatXML(const char *xmcfg, const char *xml)
{ {
char *xmcfgData = NULL; g_autofree char *xmcfgData = NULL;
char *gotxml = NULL; g_autofree char *gotxml = NULL;
g_autoptr(virConf) conf = NULL; g_autoptr(virConf) conf = NULL;
int ret = -1; int ret = -1;
virDomainDef *def = NULL; virDomainDef *def = NULL;
@ -107,8 +106,6 @@ testCompareFormatXML(const char *xmcfg, const char *xml)
ret = 0; ret = 0;
fail: fail:
VIR_FREE(xmcfgData);
VIR_FREE(gotxml);
virDomainDefFree(def); virDomainDefFree(def);
return ret; return ret;
@ -125,8 +122,8 @@ testCompareHelper(const void *data)
{ {
int result = -1; int result = -1;
const struct testInfo *info = data; const struct testInfo *info = data;
char *xml = NULL; g_autofree char *xml = NULL;
char *cfg = NULL; g_autofree char *cfg = NULL;
xml = g_strdup_printf("%s/xmconfigdata/test-%s.xml", abs_srcdir, info->name); xml = g_strdup_printf("%s/xmconfigdata/test-%s.xml", abs_srcdir, info->name);
cfg = g_strdup_printf("%s/xmconfigdata/test-%s.cfg", abs_srcdir, info->name); cfg = g_strdup_printf("%s/xmconfigdata/test-%s.cfg", abs_srcdir, info->name);
@ -136,9 +133,6 @@ testCompareHelper(const void *data)
else else
result = testCompareFormatXML(cfg, xml); result = testCompareFormatXML(cfg, xml);
VIR_FREE(xml);
VIR_FREE(cfg);
return result; return result;
} }