108 lines
3.1 KiB
Diff
108 lines
3.1 KiB
Diff
From 3e1026fb3619aae6b1be4879797474d10d22a54c Mon Sep 17 00:00:00 2001
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Fri, 15 May 2020 11:16:32 +0200
|
|
Subject: [PATCH 08/18] qemuMonitorJSON(Add|Remove)Netdev: Refactor cleanup
|
|
|
|
Use automatic pointer cleanup for virJSONValuePtrs to get rid of the
|
|
cleanup label and ret variable.
|
|
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
---
|
|
src/qemu/qemu_monitor_json.c | 52 +++++++++++++++---------------------
|
|
1 file changed, 22 insertions(+), 30 deletions(-)
|
|
|
|
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
|
|
index ef25764a98..e6b5c7140e 100644
|
|
--- a/src/qemu/qemu_monitor_json.c
|
|
+++ b/src/qemu/qemu_monitor_json.c
|
|
@@ -3991,13 +3991,13 @@ int qemuMonitorJSONCloseFileHandle(qemuMonitorPtr mon,
|
|
}
|
|
|
|
|
|
-int qemuMonitorJSONAddNetdev(qemuMonitorPtr mon,
|
|
- const char *netdevstr)
|
|
+int
|
|
+qemuMonitorJSONAddNetdev(qemuMonitorPtr mon,
|
|
+ const char *netdevstr)
|
|
{
|
|
- int ret = -1;
|
|
- virJSONValuePtr cmd = NULL;
|
|
- virJSONValuePtr reply = NULL;
|
|
- virJSONValuePtr args = NULL;
|
|
+ g_autoptr(virJSONValue) cmd = NULL;
|
|
+ g_autoptr(virJSONValue) reply = NULL;
|
|
+ g_autoptr(virJSONValue) args = NULL;
|
|
|
|
cmd = qemuMonitorJSONMakeCommand("netdev_add", NULL);
|
|
if (!cmd)
|
|
@@ -4005,49 +4005,41 @@ int qemuMonitorJSONAddNetdev(qemuMonitorPtr mon,
|
|
|
|
args = qemuMonitorJSONKeywordStringToJSON(netdevstr, "type");
|
|
if (!args)
|
|
- goto cleanup;
|
|
+ return -1;
|
|
|
|
if (virJSONValueObjectAppend(cmd, "arguments", args) < 0)
|
|
- goto cleanup;
|
|
+ return -1;
|
|
args = NULL; /* obj owns reference to args now */
|
|
|
|
if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
|
|
- goto cleanup;
|
|
+ return -1;
|
|
|
|
if (qemuMonitorJSONCheckError(cmd, reply) < 0)
|
|
- goto cleanup;
|
|
+ return -1;
|
|
|
|
- ret = 0;
|
|
- cleanup:
|
|
- virJSONValueFree(args);
|
|
- virJSONValueFree(cmd);
|
|
- virJSONValueFree(reply);
|
|
- return ret;
|
|
+ return 0;
|
|
}
|
|
|
|
|
|
-int qemuMonitorJSONRemoveNetdev(qemuMonitorPtr mon,
|
|
- const char *alias)
|
|
+int
|
|
+qemuMonitorJSONRemoveNetdev(qemuMonitorPtr mon,
|
|
+ const char *alias)
|
|
{
|
|
- int ret = -1;
|
|
- virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("netdev_del",
|
|
- "s:id", alias,
|
|
- NULL);
|
|
- virJSONValuePtr reply = NULL;
|
|
+ g_autoptr(virJSONValue) cmd = qemuMonitorJSONMakeCommand("netdev_del",
|
|
+ "s:id", alias,
|
|
+ NULL);
|
|
+ g_autoptr(virJSONValue) reply = NULL;
|
|
+
|
|
if (!cmd)
|
|
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;
|
|
}
|
|
|
|
|
|
--
|
|
2.23.0.windows.1
|
|
|