From nobody Sun Feb 8 09:41:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1638452283; cv=none; d=zohomail.com; s=zohoarc; b=aCAjGeyfCHkAQx62rZ/d0GqDtn2rTbzVKLDdupHU/ODxjLbqU3oTejXe3ZQ6uc7Kim9KlFEgBpmPQkWT6pT9VXN9B8/5Z6YXfZ1lt3SX83R/lfKdkpVaUXihFzz0erd3mzejZqsu/btvqmMRW5kAoXErAGOmBeTt49QhYyPUJDU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638452283; 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=/LFQx6dtthDND2Q+qIdKcEz3w7eqaRR9ElW6jGYgPSA=; b=jzSNuA826LaSPfZLvF3K8K9JLb0xSb1a64isO45i1+mWhKt4Z9F9JZ4OIju7uDvlvw0rHxOFuo7dezyOyM9yRGVecRUWQr5CAlmOtlRJyF6wgYqQIgTwd2M36CS4+KcFdRZ+EOiy+Ah//Ab7HntFGn2HKnM+pli8NVUrT3gS2ws= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1638452283848925.5687879309462; Thu, 2 Dec 2021 05:38:03 -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-356-C1-f6gXlPM-NX-1YRwlROg-1; Thu, 02 Dec 2021 08:37:59 -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 721FA64083; Thu, 2 Dec 2021 13:37:54 +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 556005D9D5; Thu, 2 Dec 2021 13:37:54 +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 27D761809CB7; Thu, 2 Dec 2021 13:37:54 +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 1B2DXWp6021074 for ; Thu, 2 Dec 2021 08:33:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id DCD0B5D9D5; Thu, 2 Dec 2021 13:33:31 +0000 (UTC) Received: from antique-work.lan (unknown [10.40.192.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B96D5D9CA for ; Thu, 2 Dec 2021 13:33:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638452282; 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=/LFQx6dtthDND2Q+qIdKcEz3w7eqaRR9ElW6jGYgPSA=; b=ClwAF3UKrU6cyQP75zoZMLGnjhE15acc719H1eWPEiyjM0pZpcV5xDxZtmcs0Rz/yNZ5si KctIMwaSqVJ5pd6yUMCCu+kGLPFnQf9WMznElml0Re80xu4Tbe6u/wT9A6OzHSbi2mb7ZR EkYZcSmdGzcRx+L2qutHrQCslhRiICg= X-MC-Unique: C1-f6gXlPM-NX-1YRwlROg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 10/14] qemu_snapshot: revert: move saving metadata to separate function Date: Thu, 2 Dec 2021 14:33:17 +0100 Message-Id: <8cb15abb0bd40e64e8f1d16e5fca4c96552341bd.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.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: 1638452285790100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/qemu/qemu_snapshot.c | 58 +++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 1d4af221e2..8ad441e41a 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1997,6 +1997,40 @@ qemuSnapshotRevertPrep(virDomainMomentObj *snap, } =20 =20 +static int +qemuSnapshotRevertWriteMetadata(virDomainObj *vm, + virDomainMomentObj *snap, + virQEMUDriver *driver, + virQEMUDriverConfig *cfg, + bool defined) +{ + qemuSnapshotSetCurrent(vm, snap); + if (qemuDomainSnapshotWriteMetadata(vm, snap, + driver->xmlopt, + cfg->snapshotDir) < 0) { + virDomainSnapshotSetCurrent(vm->snapshots, NULL); + return -1; + } + + if (defined && vm->persistent) { + int detail; + virObjectEvent *event =3D NULL; + virDomainDef *saveDef =3D vm->newDef ? vm->newDef : vm->def; + + if (virDomainDefSave(saveDef, driver->xmlopt, cfg->configDir) < 0) + return -1; + + detail =3D VIR_DOMAIN_EVENT_DEFINED_FROM_SNAPSHOT; + event =3D virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_DEFINED, + detail); + virObjectEventStateQueue(driver->domainEventState, event); + } + + return 0; +} + + /* The domain is expected to be locked and inactive. */ static int qemuSnapshotRevertInactive(virQEMUDriver *driver, @@ -2247,28 +2281,8 @@ qemuSnapshotRevert(virDomainObj *vm, endjob: qemuProcessEndJob(driver, vm); =20 - if (ret =3D=3D 0) { - qemuSnapshotSetCurrent(vm, snap); - if (qemuDomainSnapshotWriteMetadata(vm, snap, - driver->xmlopt, - cfg->snapshotDir) < 0) { - virDomainSnapshotSetCurrent(vm->snapshots, NULL); - ret =3D -1; - } - } - if (ret =3D=3D 0 && defined && vm->persistent) { - virDomainDef *saveDef =3D vm->newDef ? vm->newDef : vm->def; - - ret =3D virDomainDefSave(saveDef, driver->xmlopt, cfg->configDir); - - if (ret =3D=3D 0) { - detail =3D VIR_DOMAIN_EVENT_DEFINED_FROM_SNAPSHOT; - event =3D virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_DEFINED, - detail); - virObjectEventStateQueue(driver->domainEventState, event); - } - } + if (ret =3D=3D 0) + ret =3D qemuSnapshotRevertWriteMetadata(vm, snap, driver, cfg, def= ined); =20 return ret; } --=20 2.31.1