NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemumonitorjsontest: GetCPUModelComparison: use g_auto

Browse Source 
Use g_autoptr for the virCPUDef variables and get rid
of the cleanup label.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2020-02-22 00:55:50 +01:00
parent 7b6308b725
commit 4bc5a32e6f
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/qemumonitorjsontest.c
View File

@ -2981,10 +2981,9 @@ testQemuMonitorJSONqemuMonitorJSONGetCPUModelComparison(const void *opaque)
{ {
const testGenericData *data = opaque; const testGenericData *data = opaque;
g_autoptr(qemuMonitorTest) test = NULL; g_autoptr(qemuMonitorTest) test = NULL;
virCPUDefPtr cpu_a; g_autoptr(virCPUDef) cpu_a = virCPUDefNew();
virCPUDefPtr cpu_b = NULL; g_autoptr(virCPUDef) cpu_b = virCPUDefNew();
g_autofree char *result = NULL; g_autofree char *result = NULL;
int ret = -1;
if (!(test = qemuMonitorTestNewSchema(data->xmlopt, data->schema))) if (!(test = qemuMonitorTestNewSchema(data->xmlopt, data->schema)))
return -1; return -1;
@ -2993,28 +2992,20 @@ testQemuMonitorJSONqemuMonitorJSONGetCPUModelComparison(const void *opaque)
"{\"return\":{\"result\":\"test\"}}") < 0) "{\"return\":{\"result\":\"test\"}}") < 0)
return -1; return -1;
cpu_a = virCPUDefNew();
cpu_b = virCPUDefNew();
cpu_a->model = g_strdup("cpu_a"); cpu_a->model = g_strdup("cpu_a");
cpu_b->model = g_strdup("cpu_b"); cpu_b->model = g_strdup("cpu_b");
if (qemuMonitorJSONGetCPUModelComparison(qemuMonitorTestGetMonitor(test), if (qemuMonitorJSONGetCPUModelComparison(qemuMonitorTestGetMonitor(test),
cpu_a, cpu_b, &result) < 0) cpu_a, cpu_b, &result) < 0)
goto cleanup; return -1;
if (!result || STRNEQ(result, "test")) { if (!result || STRNEQ(result, "test")) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
"Compare result not set"); "Compare result not set");
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
virCPUDefFree(cpu_a);
virCPUDefFree(cpu_b);
return ret;
} }