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: bhyve: use g_autofree where possible

Browse Source 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
Reviewed-by: Roman Bogorodskiy <bogorodskiy@gmail.com>
This commit is contained in:
Ján Tomko 2020-07-28 02:56:33 +02:00
parent 7b4a8995a0
commit a7d3d925a7
3 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/bhyveargv2xmltest.c
View File

@ -28,9 +28,9 @@ testCompareXMLToArgvFiles(const char *xmlfile,
unsigned int flags) unsigned int flags)
{ {
char *actualxml = NULL; g_autofree char *actualxml = NULL;
char *cmd = NULL; g_autofree char *cmd = NULL;
char *log = NULL; g_autofree char *log = NULL;
int ret = -1; int ret = -1;
virDomainDefPtr vmdef = NULL; virDomainDefPtr vmdef = NULL;
@ -86,9 +86,6 @@ testCompareXMLToArgvFiles(const char *xmlfile,
ret = 0; ret = 0;
fail: fail:
VIR_FREE(actualxml);
VIR_FREE(cmd);
VIR_FREE(log);
virDomainDefFree(vmdef); virDomainDefFree(vmdef);
return ret; return ret;
} }
@ -103,8 +100,8 @@ testCompareXMLToArgvHelper(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 *args = NULL; g_autofree char *args = NULL;
xml = g_strdup_printf("%s/bhyveargv2xmldata/bhyveargv2xml-%s.xml", xml = g_strdup_printf("%s/bhyveargv2xmldata/bhyveargv2xml-%s.xml",
abs_srcdir, info->name); abs_srcdir, info->name);
@ -112,9 +109,6 @@ testCompareXMLToArgvHelper(const void *data)
abs_srcdir, info->name); abs_srcdir, info->name);
result = testCompareXMLToArgvFiles(xml, args, info->flags); result = testCompareXMLToArgvFiles(xml, args, info->flags);
VIR_FREE(xml);
VIR_FREE(args);
return result; return result;
} }

21
tests/bhyvexml2argvtest.c
View File

@ -26,9 +26,9 @@ static int testCompareXMLToArgvFiles(const char *xml,
const char *dmcmdline, const char *dmcmdline,
unsigned int flags) unsigned int flags)
{ {
char *actualargv = NULL; g_autofree char *actualargv = NULL;
char *actualld = NULL; g_autofree char *actualld = NULL;
char *actualdm = NULL; g_autofree char *actualdm = NULL;
virDomainDefPtr vmdef = NULL; virDomainDefPtr vmdef = NULL;
virCommandPtr cmd = NULL; virCommandPtr cmd = NULL;
virCommandPtr ldcmd = NULL; virCommandPtr ldcmd = NULL;
@ -99,9 +99,6 @@ static int testCompareXMLToArgvFiles(const char *xml,
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(actualargv);
VIR_FREE(actualld);
VIR_FREE(actualdm);
virCommandFree(cmd); virCommandFree(cmd);
virCommandFree(ldcmd); virCommandFree(ldcmd);
virDomainDefFree(vmdef); virDomainDefFree(vmdef);
@ -119,10 +116,10 @@ testCompareXMLToArgvHelper(const void *data)
{ {
int ret = -1; int ret = -1;
const struct testInfo *info = data; const struct testInfo *info = data;
char *xml = NULL; g_autofree char *xml = NULL;
char *args = NULL; g_autofree char *args = NULL;
char *ldargs = NULL; g_autofree char *ldargs = NULL;
char *dmargs = NULL; g_autofree char *dmargs = NULL;
xml = g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.xml", xml = g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.xml",
abs_srcdir, info->name); abs_srcdir, info->name);
@ -135,10 +132,6 @@ testCompareXMLToArgvHelper(const void *data)
ret = testCompareXMLToArgvFiles(xml, args, ldargs, dmargs, info->flags); ret = testCompareXMLToArgvFiles(xml, args, ldargs, dmargs, info->flags);
VIR_FREE(xml);
VIR_FREE(args);
VIR_FREE(ldargs);
VIR_FREE(dmargs);
return ret; return ret;
} }

6
tests/bhyvexml2xmltest.c
View File

@ -26,8 +26,8 @@ static int
testCompareXMLToXMLHelper(const void *data) testCompareXMLToXMLHelper(const void *data)
{ {
const struct testInfo *info = data; const struct testInfo *info = data;
char *xml_in = NULL; g_autofree char *xml_in = NULL;
char *xml_out = NULL; g_autofree char *xml_out = NULL;
bool is_different = info->flags & FLAG_IS_DIFFERENT; bool is_different = info->flags & FLAG_IS_DIFFERENT;
int ret = -1; int ret = -1;
@ -48,8 +48,6 @@ testCompareXMLToXMLHelper(const void *data)
virResetLastError(); virResetLastError();
} }
VIR_FREE(xml_in);
VIR_FREE(xml_out);
return ret; return ret;
} }