From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 28 Feb 2022 15:35:09 +0000 (+0100)
Subject: virsh: cmdDomDisplay: Remove unneeded 'cleanup' label
X-Git-Tag: v8.2.0-rc1~216
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdc9269b9952f1c57c8be10b6326df13f47b0fe7;p=thirdparty%2Flibvirt.git

virsh: cmdDomDisplay: Remove unneeded 'cleanup' label

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index f82aa49745..7c06c3f80d 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -11864,17 +11864,17 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd)
 
     if (!virDomainIsActive(dom)) {
         vshError(ctl, _("Domain is not running"));
-        goto cleanup;
+        return false;
     }
 
     if (vshCommandOptBool(cmd, "include-password"))
         flags |= VIR_DOMAIN_XML_SECURE;
 
     if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0)
-        goto cleanup;
+        return false;
 
     if (virshDomainGetXMLFromDom(ctl, dom, flags, &xml, &ctxt) < 0)
-        goto cleanup;
+        return false;
 
     /* Attempt to grab our display info */
     for (iter = 0; scheme[iter] != NULL; iter++) {
@@ -11903,7 +11903,6 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd)
             vshError(ctl, _("No graphical display found"));
     }
 
- cleanup:
     return ret;
 }