openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ch: use g_auto in virCHMonitorBuildKernelRelatedJson 

Signed-off-by: William Douglas <william.douglas@intel.com>
Reviewed-by: Laine Stump <laine@redhat.com>
This commit is contained in:
William Douglas 2021-10-01 11:12:36 -07:00 committed by Laine Stump
parent 2ba777f5e3
commit 9e99f84328
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/ch/ch_monitor.c
View File

@ -112,43 +112,36 @@ virCHMonitorBuildPTYJson(virJSONValue *content, virDomainDef *vmdef)
static int
virCHMonitorBuildKernelRelatedJson(virJSONValue *content, virDomainDef *vmdef)
{
virJSONValue *kernel = virJSONValueNewObject();
virJSONValue *cmdline = virJSONValueNewObject();
virJSONValue *initramfs = virJSONValueNewObject();
g_autoptr(virJSONValue) kernel = virJSONValueNewObject();
g_autoptr(virJSONValue) cmdline = virJSONValueNewObject();
g_autoptr(virJSONValue) initramfs = virJSONValueNewObject();
if (vmdef->os.kernel == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Kernel image path in this domain is not defined"));
goto cleanup;
return -1;
} else {
if (virJSONValueObjectAppendString(kernel, "path", vmdef->os.kernel) < 0)
goto cleanup;
return -1;
if (virJSONValueObjectAppend(content, "kernel", &kernel) < 0)
goto cleanup;
return -1;
}
if (vmdef->os.cmdline) {
if (virJSONValueObjectAppendString(cmdline, "args", vmdef->os.cmdline) < 0)
goto cleanup;
return -1;
if (virJSONValueObjectAppend(content, "cmdline", &cmdline) < 0)
goto cleanup;
return -1;
}
if (vmdef->os.initrd != NULL) {
if (virJSONValueObjectAppendString(initramfs, "path", vmdef->os.initrd) < 0)
goto cleanup;
return -1;
if (virJSONValueObjectAppend(content, "initramfs", &initramfs) < 0)
goto cleanup;
return -1;
}
return 0;
cleanup:
virJSONValueFree(kernel);
virJSONValueFree(cmdline);
virJSONValueFree(initramfs);
return -1;
}
static int