From nobody Tue Feb 10 20:47:57 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; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=openvz.org 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 1648725601586345.8520103198339; Thu, 31 Mar 2022 04:20:01 -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-643-GhIu1yIkOBuSEesNGTJg-Q-1; Thu, 31 Mar 2022 07:19:56 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 807FC801E67; Thu, 31 Mar 2022 11:19:53 +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 6B86BC15D78; Thu, 31 Mar 2022 11:19:53 +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 336791947BBB; Thu, 31 Mar 2022 11:19:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B424B19451F3 for ; Thu, 31 Mar 2022 11:19:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 97D86401E67; Thu, 31 Mar 2022 11:19:51 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 93BCC401E64 for ; Thu, 31 Mar 2022 11:19:51 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 798CA899ED2 for ; Thu, 31 Mar 2022 11:19:51 +0000 (UTC) Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-491-OeSDlF1_MzCxUSV5lhQTrw-1; Thu, 31 Mar 2022 07:19:49 -0400 Received: by mail-lj1-f170.google.com with SMTP id bn33so31545680ljb.6 for ; Thu, 31 Mar 2022 04:19:49 -0700 (PDT) Received: from vzbook.. (broadband-90-154-71-96.ip.moscow.rt.ru. [90.154.71.96]) by smtp.gmail.com with ESMTPSA id b24-20020a196458000000b0044ab702b6acsm695653lfj.238.2022.03.31.04.19.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 04:19:47 -0700 (PDT) X-MC-Unique: GhIu1yIkOBuSEesNGTJg-Q-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: OeSDlF1_MzCxUSV5lhQTrw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dk6AH49QGH7pKABcTMbkix8Yaar9GIodlF2uKU1BmW0=; b=w6G6GSV6uZDZDWDoznS7dX+wUJqU2WJy3WYooGMKWtn6hRQZ/52+Pe2LGEZL/544yS 6g2+PHrH8fmz0s0tY3/V9Kd2zGdOSZH4mnhRnQ+hj5Gjp2yMyV3deUiOm+cH8/UPS7in AFPtwPw0d+omXpusdx8HemaEh+ldaASzysOfG+yBIgSJ3gwtnbf+MKar62DmVHm5NhVA 1A8KSxwIkzQ5bmAE+Qvlb+AA4bX62zHH8K9JAcPIPHL9doNFXvGVAQDY7smz75ClG337 4DD5vz3n+IpATNZIIyKiAfhk5Xb+32Tz3551PgqoDlN7r8zK7zXeFvy8RRo7pbu7UsW/ +3qw== X-Gm-Message-State: AOAM531c7hl5e4vhqUCaEv6IEgLfoUtC1TyvDHl3pg0h6xRPyj8Ytzjs I9VoJjm2tJF00EIeKQkSBOr83f8r8T9NOw== X-Google-Smtp-Source: ABdhPJyykmW15YaMyzbKNN++CZ8VhXJ55Had/rPReFMuwM+MRHmONclvM81Zqg+kbzkQe3DGJiGb5A== X-Received: by 2002:a2e:a7ca:0:b0:249:862b:525 with SMTP id x10-20020a2ea7ca000000b00249862b0525mr10216196ljp.491.1648725587464; Thu, 31 Mar 2022 04:19:47 -0700 (PDT) From: Nikolay Shirokovskiy To: libvir-list@redhat.com Subject: [PATCH 11/11] qemu: use snapshot-delete for modern QEMU to delete snapshot Date: Thu, 31 Mar 2022 14:19:21 +0300 Message-Id: <20220331111921.450496-12-nikolay.shirokovskiy@openvz.org> In-Reply-To: <20220331111921.450496-1-nikolay.shirokovskiy@openvz.org> References: <20220331111921.450496-1-nikolay.shirokovskiy@openvz.org> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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 2.85 on 10.11.54.8 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-ZM-MESSAGEID: 1648725602750100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Nikolay Shirokovskiy --- src/qemu/qemu_snapshot.c | 54 ++++++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 605288f6c5..fb34c21495 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -267,6 +267,50 @@ qemuSnapshotWaitJob(virQEMUDriver *driver, } =20 =20 +static int +qemuSnapshotDiscardDataActive(virQEMUDriver *driver, + virDomainObj *vm, + virDomainMomentObj *snap) +{ + qemuDomainObjPrivate *priv =3D vm->privateData; + bool modern =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_SNAPSHOT_SAVE= ); + virDomainSnapshotDef *snapdef =3D virDomainSnapshotObjGetDef(snap); + g_autoptr(GPtrArray) devices =3D g_ptr_array_new(); + int rc; + + if (!modern) { + if (qemuDomainObjEnterMonitorAsync(driver, vm, + VIR_ASYNC_JOB_SNAPSHOT_DELETE) = < 0) + return -1; + + rc =3D qemuMonitorDeleteSnapshot(priv->mon, snap->def->name); + qemuDomainObjExitMonitor(vm); + if (rc < 0) + return -1; + + return 0; + } + + if (!(devices =3D qemuSnapshotGetDisksNodes(snapdef, vm->def, NULL))) + return -1; + + if (qemuDomainObjEnterMonitorAsync(driver, vm, + VIR_ASYNC_JOB_SNAPSHOT_DELETE) < 0) + return -1; + rc =3D qemuMonitorSnapshotDelete(priv->mon, + "snapshot-delete", + snap->def->name, + (const char **)devices->pdata, + devices->len); + qemuDomainObjExitMonitor(vm); + if (rc < 0) + return -1; + + return qemuSnapshotWaitJob(driver, vm, VIR_ASYNC_JOB_SNAPSHOT_DELETE, + "snapshot-delete"); +} + + /* Discard one snapshot (or its metadata), without reparenting any childre= n. */ static int qemuSnapshotDiscard(virQEMUDriver *driver, @@ -276,7 +320,6 @@ qemuSnapshotDiscard(virQEMUDriver *driver, bool metadata_only) { g_autofree char *snapFile =3D NULL; - qemuDomainObjPrivate *priv; virDomainMomentObj *parentsnap =3D NULL; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 @@ -301,13 +344,8 @@ qemuSnapshotDiscard(virQEMUDriver *driver, if (qemuSnapshotForEachQcow2(driver, def, snap, "-d", true) < = 0) return -1; } else { - priv =3D vm->privateData; - if (qemuDomainObjEnterMonitorAsync(driver, vm, - VIR_ASYNC_JOB_SNAPSHOT) =3D= =3D 0) { - /* we continue on even in the face of error */ - qemuMonitorDeleteSnapshot(priv->mon, snap->def->name); - qemuDomainObjExitMonitor(vm); - } + /* we continue on even in the face of error */ + qemuSnapshotDiscardDataActive(driver, vm, snap); } } =20 --=20 2.35.1