From nobody Sun Feb 8 17:04:38 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=1638452054; cv=none; d=zohomail.com; s=zohoarc; b=O8bLfarA00N/k2G1Rsnl+uPFwqhPVWSuUHLGgoLybov8MGo9e8gSEZbX1JAXpmpafXtY8PIc0HzYzcnq19TB1DInAG4nqbK9mD1TcUVRYWvDG88r+mghx8g4hk1ycWVFXu1vWPDBaUWspxzaa8SYxLHZDhXmxD7RlpzjH48npWw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638452054; 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=fmvaIbvxusFxnGftAMZ+ociJyg6J2mnAThVEmtLQAZM=; b=P77yLtrdKWWyJKgwNQsjdn0XWqyQEKAEzQpNJCovh0vtZ3ED7gQR+e06FC1gypyjXjIFlN0UjVxopF8maSHpfu3wKH55yem+rsvg4C2btpme8V1HVoyQP3dl7RCYpNa/nV5TLqAVX1ZJ25/GP5snKtUqZTWe4sOKQ1v7nQ/37UI= 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 1638452054553229.46857929673342; Thu, 2 Dec 2021 05:34:14 -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-492-P09S12ryMzmcBp48RM5Ikw-1; Thu, 02 Dec 2021 08:34:06 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 72C4684BA1E; Thu, 2 Dec 2021 13:34:01 +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 5933E45D67; Thu, 2 Dec 2021 13:34:01 +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 2D4C41809C8A; Thu, 2 Dec 2021 13:34:01 +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 1B2DXQtC021001 for ; Thu, 2 Dec 2021 08:33:26 -0500 Received: by smtp.corp.redhat.com (Postfix) id 97CE85D9D5; Thu, 2 Dec 2021 13:33:26 +0000 (UTC) Received: from antique-work.lan (unknown [10.40.192.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15DA95D9CA for ; Thu, 2 Dec 2021 13:33:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638452053; 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=fmvaIbvxusFxnGftAMZ+ociJyg6J2mnAThVEmtLQAZM=; b=LbgzSxwPClaivh6Bfgieq+gOxooh/SP8F2MljAeqtNskR0Od87iZxpI6C+xS9ewVKmey7W 6Giqb0nutzW+6uVVOj6QK2Rlj2FhJDLyRVtw7ErB5XGgPYaRfi5i+PsiVdoSusV9XAk5Vp YOMm5Ohm4b8k6vPTImyHRLvfHcjqnUk= X-MC-Unique: P09S12ryMzmcBp48RM5Ikw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 04/14] qemu_snapshot: revert: jump to endjob instead of calling qemuProcessEndJob Date: Thu, 2 Dec 2021 14:33:11 +0100 Message-Id: <561bfc5157632d3fb82fab38da3d979d4f491a54.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.11 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: 1638452055534100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/qemu/qemu_snapshot.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 5ac1c99a68..8191733a6d 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -2149,8 +2149,7 @@ qemuSnapshotRevert(virDomainObj *vm, =20 if (qemuSnapshotRevertInactive(driver, vm, snap) < 0) { qemuDomainRemoveInactive(driver, vm); - qemuProcessEndJob(driver, vm); - goto cleanup; + goto endjob; } =20 if (inactiveConfig) { @@ -2173,8 +2172,7 @@ qemuSnapshotRevert(virDomainObj *vm, virDomainAuditStart(vm, "from-snapshot", rc >=3D 0); if (rc < 0) { qemuDomainRemoveInactive(driver, vm); - qemuProcessEndJob(driver, vm); - goto cleanup; + goto endjob; } detail =3D VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT; event =3D virDomainEventLifecycleNewFromObj(vm, --=20 2.31.1