From nobody Mon Feb 9 03:48:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646229384; cv=none; d=zohomail.com; s=zohoarc; b=F8vdkKlBFSk9hli82fYXpCHka3v4SwKUBuIlBP8q7FxbRqtO/6vEhkJdAqPgf8WLI6I5ZGbexK6c2m+4SlII4c+66i3Hki3CJgyGxGYj9/7RPlur6tJUFalEqQKACKj7YKun/TlJxy3mBMdqmARTeoq0gFmkrlqMVX0+/sBDdsM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646229384; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/ojsv+PmaQAiIvHkjRldTuO5myp+RWYOu5Zu1RBRTrc=; b=KeNbY06dXVW1JNtXMOnEGCVtMQa6MQkc6wKwb3R1LJKbmEzcvKyzCREdCyFXDOzoCL1mvAybdQCm3Wn2IcUToLwHvl4oUfvDhX1T1kZMeXXCwd3plYIjhXnYEgvtAsyYTMCU6+UZbN+WqmLu4xWxbCrWXN9319xKUGtRC6x/bng= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1646229384126571.8228399318043; Wed, 2 Mar 2022 05:56:24 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-637-7fzFdk-eN5Knq3QXCCmfVg-1; Wed, 02 Mar 2022 08:56:19 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 12E695200; Wed, 2 Mar 2022 13:56:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E8EF07B8D8; Wed, 2 Mar 2022 13:56:14 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BBEAF1807D69; Wed, 2 Mar 2022 13:56:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 222DuDCZ017765 for ; Wed, 2 Mar 2022 08:56:13 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5AB8083783; Wed, 2 Mar 2022 13:56:13 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4F4C83780 for ; Wed, 2 Mar 2022 13:56:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646229383; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/ojsv+PmaQAiIvHkjRldTuO5myp+RWYOu5Zu1RBRTrc=; b=IIaNFPiLfFOrzFYCVXKcEZgxnzAFZwXt7BcgSH7Bbftc8QMR4Q/wGmMB+bBei0/Pt6h29f 9LMgTZlKJrh8iS5bQ6rJOVVjQwfcKc59j26DLs4Kl2EKtzviOGBnKeZUqfrGfZSBd8q2nh nTbm42wCXG0xpjAROMIZj7fCvLcp0Os= X-MC-Unique: 7fzFdk-eN5Knq3QXCCmfVg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 12/23] virsh: cmdDomDisplay: Remove unneeded 'cleanup' label Date: Wed, 2 Mar 2022 14:55:11 +0100 Message-Id: <50d3b06d1269d7fac207ed9506f42343e9ff8cfe.1646229194.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646229385253100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- tools/virsh-domain.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 |=3D 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 =3D 0; scheme[iter] !=3D NULL; iter++) { @@ -11903,7 +11903,6 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) vshError(ctl, _("No graphical display found")); } - cleanup: return ret; } --=20 2.35.1