qemuMonitorJSONAddDeviceProps: Refactor cleanup

Use automatic memory freeing and remove 'ret' variable and 'cleanup'
label.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-09-25 08:34:48 +02:00
parent 2154718c29
commit fbc088ab82

View File

@ -4557,27 +4557,22 @@ int
qemuMonitorJSONAddDeviceProps(qemuMonitor *mon,
virJSONValue **props)
{
int ret = -1;
virJSONValue *cmd = NULL;
virJSONValue *reply = NULL;
g_autoptr(virJSONValue) cmd = NULL;
g_autoptr(virJSONValue) reply = NULL;
if (!(cmd = qemuMonitorJSONMakeCommand("device_add", NULL)))
goto cleanup;
return -1;
if (virJSONValueObjectAppend(cmd, "arguments", props) < 0)
goto cleanup;
return -1;
if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
goto cleanup;
return -1;
if (qemuMonitorJSONCheckError(cmd, reply) < 0)
goto cleanup;
return -1;
ret = 0;
cleanup:
virJSONValueFree(cmd);
virJSONValueFree(reply);
return ret;
return 0;
}