External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-12 21:05:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: glib-ify vircaps2xmltest

Browse Source 
Ideally, turning pointers into g_auto* would be done in one step
and dropping cleanup label and unused @ret variable in second
step, but since this is a test we don't care that much, do we?

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Michal Privoznik 2021-05-28 15:59:35 +02:00
parent 3dab81cb21
commit 5899bfd795
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/vircaps2xmltest.c
View File

@ -38,12 +38,11 @@ test_virCapabilities(const void *opaque)
{
struct virCapabilitiesData *data = (struct virCapabilitiesData *) opaque;
const char *archStr = virArchToString(data->arch);
virCaps *caps = NULL;
char *capsXML = NULL;
char *path = NULL;
char *system = NULL;
char *resctrl = NULL;
int ret = -1;
g_autoptr(virCaps) caps = NULL;
g_autofree char *capsXML = NULL;
g_autofree char *path = NULL;
g_autofree char *system = NULL;
g_autofree char *resctrl = NULL;
system = g_strdup_printf("%s/vircaps2xmldata/linux-%s/system", abs_srcdir,
data->filename);
@ -56,34 +55,26 @@ test_virCapabilities(const void *opaque)
caps = virCapabilitiesNew(data->arch, data->offlineMigrate, data->liveMigrate);
if (!caps)
goto cleanup;
return -1;
if (!(caps->host.numa = virCapabilitiesHostNUMANewHost()))
goto cleanup;
return -1;
if (virCapabilitiesInitCaches(caps) < 0)
goto cleanup;
return -1;
virFileWrapperClearPrefixes();
if (!(capsXML = virCapabilitiesFormatXML(caps)))
goto cleanup;
return -1;
path = g_strdup_printf("%s/vircaps2xmldata/vircaps-%s-%s.xml", abs_srcdir,
archStr, data->filename);
if (virTestCompareToFile(capsXML, path) < 0)
goto cleanup;
return -1;
ret = 0;
cleanup:
VIR_FREE(system);
VIR_FREE(resctrl);
VIR_FREE(path);
VIR_FREE(capsXML);
virObjectUnref(caps);
return ret;
return 0;
}
static int