From 215007f24f5bad111ce72e030a212c0f8a0c6ed9 Mon Sep 17 00:00:00 2001 From: Daniel Henrique Barboza Date: Mon, 21 Oct 2019 15:18:59 -0300 Subject: [PATCH] qemu_monitor_json.c: remove unneeded cleanup label MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qemuMonitorJSONBlockIoThrottleInfo uses a macro called GET_THROTTLE_STATS that's defined outside of the function, which references a 'cleanup' label. GET_THROTTLE_STATS is only used inside qemuMonitorJSONBlockIoThrottleInfo (in fact, the macro is undef right after it) thus it is safe to erase the 'cleanup' reference inside the macro, then proceed with the usual cleanup label removal inside qemuMonitorJSONBlockIoThrottleInfo. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Ján Tomko --- src/qemu/qemu_monitor_json.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index d66c58feda..10f6a4cadc 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5192,7 +5192,7 @@ int qemuMonitorJSONOpenGraphics(qemuMonitorPtr mon, _("block_io_throttle field '%s' missing " \ "in qemu's output"), \ #STORE); \ - goto cleanup; \ + return -1; \ } static int qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io_throttle, @@ -5200,7 +5200,6 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io_throttle, const char *qdevid, virDomainBlockIoTuneInfoPtr reply) { - int ret = -1; size_t i; bool found = false; @@ -5214,7 +5213,7 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io_throttle, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("block_io_throttle device entry " "was not in expected format")); - goto cleanup; + return -1; } current_qdev = virJSONValueObjectGetString(temp_dev, "qdev"); @@ -5224,7 +5223,7 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io_throttle, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("block_io_throttle device entry " "was not in expected format")); - goto cleanup; + return -1; } if ((drivealias && current_drive && STRNEQ(current_drive, drivealias)) || @@ -5236,7 +5235,7 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io_throttle, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("block_io_throttle inserted entry " "was not in expected format")); - goto cleanup; + return -1; } GET_THROTTLE_STATS("bps", total_bytes_sec); GET_THROTTLE_STATS("bps_rd", read_bytes_sec); @@ -5268,12 +5267,10 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr io_throttle, virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find throttling info for device '%s'"), drivealias ? drivealias : qdevid); - goto cleanup; + return -1; } - ret = 0; - cleanup: - return ret; + return 0; } #undef GET_THROTTLE_STATS #undef GET_THROTTLE_STATS_OPTIONAL