[libvirt PATCH 6/7] qemumonitorjsontest: GetCPUModelComparison: use g_auto

Use g_autoptr for the virCPUDef variables and get rid of the cleanup label. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- tests/qemumonitorjsontest.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 1a090b0cb5..168d6cd172 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2985,10 +2985,9 @@ testQemuMonitorJSONqemuMonitorJSONGetCPUModelComparison(const void *opaque) { const testGenericData *data = opaque; g_autoptr(qemuMonitorTest) test = NULL; - virCPUDefPtr cpu_a; - virCPUDefPtr cpu_b = NULL; + g_autoptr(virCPUDef) cpu_a = virCPUDefNew(); + g_autoptr(virCPUDef) cpu_b = virCPUDefNew(); g_autofree char *result = NULL; - int ret = -1; if (!(test = qemuMonitorTestNewSchema(data->xmlopt, data->schema))) return -1; @@ -2997,28 +2996,20 @@ testQemuMonitorJSONqemuMonitorJSONGetCPUModelComparison(const void *opaque) "{\"return\":{\"result\":\"test\"}}") < 0) return -1; - cpu_a = virCPUDefNew(); - cpu_b = virCPUDefNew(); - cpu_a->model = g_strdup("cpu_a"); cpu_b->model = g_strdup("cpu_b"); if (qemuMonitorJSONGetCPUModelComparison(qemuMonitorTestGetMonitor(test), cpu_a, cpu_b, &result) < 0) - goto cleanup; + return -1; if (!result || STRNEQ(result, "test")) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "Compare result not set"); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - virCPUDefFree(cpu_a); - virCPUDefFree(cpu_b); - return ret; + return 0; } -- 2.24.1