提交 4bc5a32e 编写于 作者: J Ján Tomko

qemumonitorjsontest: GetCPUModelComparison: use g_auto

Use g_autoptr for the virCPUDef variables and get rid
of the cleanup label.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NMichal Privoznik <mprivozn@redhat.com>
上级 7b6308b7
...@@ -2981,10 +2981,9 @@ testQemuMonitorJSONqemuMonitorJSONGetCPUModelComparison(const void *opaque) ...@@ -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) ...@@ -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;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册