From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 3 Feb 2022 12:53:20 +0000 (+0100)
Subject: qemuMonitorOpen: Refactor cleanup
X-Git-Tag: v8.1.0-rc1~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=775cd951e2ac6c3e23be80d208aaf0b1f1638aa1;p=thirdparty%2Flibvirt.git

qemuMonitorOpen: Refactor cleanup

Use VIR_AUTOCLOSE to avoid a 'cleanup' label.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Tim Wiederhake <twiederh@redhat.com>
---

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 04b5cce6fb..95ed6199b1 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -725,7 +725,7 @@ qemuMonitorOpen(virDomainObj *vm,
                 qemuMonitorCallbacks *cb,
                 void *opaque)
 {
-    int fd = -1;
+    VIR_AUTOCLOSE fd = -1;
     qemuMonitor *ret = NULL;
 
     timeout += QEMU_DEFAULT_MONITOR_WAIT;
@@ -734,7 +734,7 @@ qemuMonitorOpen(virDomainObj *vm,
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("unable to handle monitor type: %s"),
                        virDomainChrTypeToString(config->type));
-        goto cleanup;
+        return NULL;
     }
 
     virObjectUnlock(vm);
@@ -743,18 +743,16 @@ qemuMonitorOpen(virDomainObj *vm,
     virObjectLock(vm);
 
     if (fd < 0)
-        goto cleanup;
+        return NULL;
 
     if (!virDomainObjIsActive(vm)) {
         virReportError(VIR_ERR_OPERATION_FAILED, "%s",
                        _("domain is not running"));
-        goto cleanup;
+        return NULL;
     }
 
     ret = qemuMonitorOpenInternal(vm, fd, context, cb, opaque);
- cleanup:
-    if (!ret)
-        VIR_FORCE_CLOSE(fd);
+    fd = -1;
     return ret;
 }