From nobody Sun Feb 8 16:05:49 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=1638452270; cv=none; d=zohomail.com; s=zohoarc; b=FY8HfYjoBoZ4Oa2Jbq1QFn1Mh/dvyKvBEFSMQTY9EsHhrwC5nYq6jipTl6NLfAHQpFLVBKi/Tz8Z9B2SdcLjwLUxcqlcXS+2L3Z9dg0L84RvCPWKf691lH1wdqtJj/7HUQNUyfEhZugiypnY/LPG17+F+BQ6DxsJsGenQQwf5+M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638452270; 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=UEsRhYSJr4bJJe8oDGKP7j/wyMdcL67HaL7TVr8j4ps=; b=Lo4vdLetEc99+dmhRvK4yGEGvwKj4DC7RmckYUQacm2FNDspHnFc4vF9D3oF6qr27DVWERfDb6P1CG5pv+NSevWCdt8zDdovyBQ1L/LMbFuMATqoWjwK3487wE2uH9KCr7RDDE1omGz3jZJty7Wn224eXytqBzWW3wPH/TmBRVk= 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 1638452270527700.9109126877416; Thu, 2 Dec 2021 05:37:50 -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-263-I-SAMXjLNXWRCGrSk5_TgQ-1; Thu, 02 Dec 2021 08:37:48 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1A8E18042E1; Thu, 2 Dec 2021 13:37:41 +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 EA79E79450; Thu, 2 Dec 2021 13:37:40 +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 A92FF1809CB7; Thu, 2 Dec 2021 13:37:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1B2DXREd021014 for ; Thu, 2 Dec 2021 08:33:27 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7AD8C5D9D5; Thu, 2 Dec 2021 13:33:27 +0000 (UTC) Received: from antique-work.lan (unknown [10.40.192.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC1A15D9CA for ; Thu, 2 Dec 2021 13:33:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638452269; 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=UEsRhYSJr4bJJe8oDGKP7j/wyMdcL67HaL7TVr8j4ps=; b=YIrIysBNdlAn+oYu0Ev1GBYtPAywtYV807BpYu+qqwELfIM9sKCV6L4RWtb/iqNCtm20Xx C711xfxYxEOettOY4T0/1ftgjgrb3B6wD3fncSOjYrrzaYdxIAj9fN+cUbIzIbCF7wPPef gAtQxJZsWVzRGmzhaKVrvuYCvn5i1g8= X-MC-Unique: I-SAMXjLNXWRCGrSk5_TgQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 05/14] qemu_snapshot: revert: remove cleanup label Date: Thu, 2 Dec 2021 14:33:12 +0100 Message-Id: <3a9da1e08a8105311da596ba598aa1f37d4f6b03.1638451855.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.16 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: 1638452272254100001 Content-Type: text/plain; charset="utf-8" Now the cleanup label is not necessary so we can drop it. Signed-off-by: Pavel Hrdina --- src/qemu/qemu_snapshot.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 8191733a6d..beeb012431 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1967,13 +1967,13 @@ qemuSnapshotRevert(virDomainObj *vm, if (qemuDomainHasBlockjob(vm, false)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain has active block job")); - goto cleanup; + return -1; } =20 if (qemuProcessBeginJob(driver, vm, VIR_DOMAIN_JOB_OPERATION_SNAPSHOT_REVERT, flags) < 0) - goto cleanup; + return -1; =20 if (!(snap =3D qemuSnapObjFromSnapshot(vm, snapshot))) goto endjob; @@ -2210,7 +2210,6 @@ qemuSnapshotRevert(virDomainObj *vm, endjob: qemuProcessEndJob(driver, vm); =20 - cleanup: if (ret =3D=3D 0) { qemuSnapshotSetCurrent(vm, snap); if (qemuDomainSnapshotWriteMetadata(vm, snap, --=20 2.31.1