From nobody Tue Oct 22 23:37:27 2024 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=1692005826; cv=none; d=zohomail.com; s=zohoarc; b=QVL4QLodytZ5s8AvgBC6t/c2I+1J7Mb2iXOoHNBFBrY42KD4AxBbWYpGScYxH6OXkpYlWtMREstXWzNUfxo31T7kzcqjFUMcYRr+2s6EvpICOI9ICqe0SJL6CInlDnq0ymHeZUQFF/SVQ06eL5A7ZodkzmQbOECX+OdwJ2v5DbY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692005826; 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=3p5JLfu5Nc5VRHsqx0H5CUQIsKbdkiRWWFFb1WEDO7M=; b=nTjIfWKvwcrhMn8aDpxsELl9LOvUSWFVHMw/8i18062cr6hkR/NNqvTEW04wMRUn79HHnJ1m9rQ8cygmNA4OahtSaR6h0Pn5m+twNR2n2XiLyk74yJnzFQQpLTYjxxHlWZdTFFMP96alHsK8Ky0ZqBw7OOkEtH6SNtF5QXPKkbE= 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 1692005826362594.2477078846172; Mon, 14 Aug 2023 02:37:06 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-475-Qw4uUedAO46z2tJAo9sCOw-1; Mon, 14 Aug 2023 05:37:00 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3B1FA104458B; Mon, 14 Aug 2023 09:36:58 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 264F9492C13; Mon, 14 Aug 2023 09:36:58 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 371F01946A54; Mon, 14 Aug 2023 09:36:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9B1D619465B2 for ; Mon, 14 Aug 2023 09:36:37 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4721440B4CCD; Mon, 14 Aug 2023 09:36:30 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.45.226.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE0C240C207D for ; Mon, 14 Aug 2023 09:36:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692005825; 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=3p5JLfu5Nc5VRHsqx0H5CUQIsKbdkiRWWFFb1WEDO7M=; b=NNUK9ueK0p9N5+72Y+i+TMiIT8c4Ct3Y8sWEndag9zHY0NEmGzuHrKrGY2gXvHmJAjEf2K lXIa1qtwO/Ul0Vq8NGIFF4CqKDp7O5mpCb+l5R6o49MvRe8viYzoOyytic1rLJmxtEqVLx ic2gXSnExat56dqTOTn37uwqM8xJ5Rw= X-MC-Unique: Qw4uUedAO46z2tJAo9sCOw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH v3 19/25] qemu_snapshot: remove revertdisks when creating new snapshot Date: Mon, 14 Aug 2023 11:36:11 +0200 Message-ID: <7d235f26a53c314a68209c245336f81b6dde045c.1692005543.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: 1692005826943100003 Content-Type: text/plain; charset="utf-8"; x-default="true" When user creates a new snapshot after reverting to non-leaf snapshot we no longer need to store the temporary overlays as they will be part of the VM XMLs stored in the newly created snapshot. Signed-off-by: Pavel Hrdina --- src/qemu/qemu_snapshot.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 6dd420a53b..0238ab2249 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1659,6 +1659,28 @@ qemuSnapshotCreateWriteMetadata(virDomainObj *vm, } =20 =20 +static void +qemuSnapshotClearRevertdisks(virDomainMomentObj *current) +{ + virDomainSnapshotDef *curdef =3D NULL; + + if (!current) + return; + + curdef =3D virDomainSnapshotObjGetDef(current); + + if (curdef->revertdisks) { + size_t i; + + for (i =3D 0; i < curdef->nrevertdisks; i++) + virDomainSnapshotDiskDefClear(&curdef->revertdisks[i]); + + g_clear_pointer(&curdef->revertdisks, g_free); + curdef->nrevertdisks =3D 0; + } +} + + static virDomainSnapshotPtr qemuSnapshotRedefine(virDomainObj *vm, virDomainPtr domain, @@ -1668,6 +1690,7 @@ qemuSnapshotRedefine(virDomainObj *vm, unsigned int flags) { virDomainMomentObj *snap =3D NULL; + virDomainMomentObj *current =3D virDomainSnapshotGetCurrent(vm->snapsh= ots); virDomainSnapshotPtr ret =3D NULL; g_autoptr(virDomainSnapshotDef) snapdef =3D virObjectRef(snapdeftmp); =20 @@ -1685,8 +1708,10 @@ qemuSnapshotRedefine(virDomainObj *vm, * makes sense, such as checking that qemu-img recognizes the * snapshot name in at least one of the domain's disks? */ =20 - if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT) + if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT) { + qemuSnapshotClearRevertdisks(current); qemuSnapshotSetCurrent(vm, snap); + } =20 if (qemuSnapshotCreateWriteMetadata(vm, snap, driver, cfg) < 0) goto error; @@ -1765,6 +1790,7 @@ qemuSnapshotCreate(virDomainObj *vm, } =20 if (!tmpsnap) { + qemuSnapshotClearRevertdisks(current); qemuSnapshotSetCurrent(vm, snap); =20 if (qemuSnapshotCreateWriteMetadata(vm, snap, driver, cfg) < 0) --=20 2.41.0