[PATCH 03/12] qemuMonitorJSONSetMigrationCapabilities: Refactor cleanup
Michal Privoznik
mprivozn at redhat.com
Thu Jan 7 11:22:49 UTC 2021
On 1/6/21 3:03 PM, Peter Krempa wrote:
> Use automatic memory freeing and remove the 'cleanup' label and 'ret'
> variable.
>
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> ---
> src/qemu/qemu_monitor_json.c | 24 +++++++++---------------
> 1 file changed, 9 insertions(+), 15 deletions(-)
>
> diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
> index 0660c37e1e..cb31df3019 100644
> --- a/src/qemu/qemu_monitor_json.c
> +++ b/src/qemu/qemu_monitor_json.c
> @@ -6974,27 +6974,21 @@ int
> qemuMonitorJSONSetMigrationCapabilities(qemuMonitorPtr mon,
> virJSONValuePtr *caps)
> {
> - int ret = -1;
> - virJSONValuePtr cmd = NULL;
> - virJSONValuePtr reply = NULL;
> + g_autoptr(virJSONValue) cmd = NULL;
> + g_autoptr(virJSONValue) reply = NULL;
>
> - cmd = qemuMonitorJSONMakeCommand("migrate-set-capabilities",
> - "a:capabilities", caps,
> - NULL);
> - if (!cmd)
> - goto cleanup;
> + if (!(cmd = qemuMonitorJSONMakeCommand("migrate-set-capabilities",
> + "a:capabilities", caps,
> + NULL)))
> + 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;
> }
>
>
Or simply return qemuMonitorJSONCheckError();
We have some such occurrences already.
Michal
More information about the libvir-list
mailing list