From nobody Fri Apr 26 11:13:38 2024 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=1678282172; cv=none; d=zohomail.com; s=zohoarc; b=Odw0+lqyOLAm0i5Fx8V+nabJSK1SLu/lRqG2LW84LPs/W+Hamsa9l6LvnZ6etojYF+1hAsQZg6yeLQbD//BwTkGP1/BlQFt06/PpRFHueMdIn5snXgbPLcCvi4Oe4aulixpf+VCVIT8uADbKbkHICBbx2uP4gChK6kD/IpkckPo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678282172; 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=+2gp19n89//uKmDaoVZjE+0UyIerc23WiSi5ZILpsrY=; b=Webhx8wSXpmc/isAOd0rdoZ/qaTN11A2UnpHDciMVDK3vzTmSvPJWzpqOQkkZ+UjLxJU1wb+5R3ScIP6h450xALknAFF+qkyIUrNP4GFFS2NuXE1Qdyx7WmM1jzsnPxUYDDpw3DAa7jKL2uxrL6Vv+4HVPjaV7Dzh82jZ7zxTS0= 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 1678282172712820.355369836159; Wed, 8 Mar 2023 05:29:32 -0800 (PST) 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-500-mtV90K2DPHGpHZkBe376GQ-1; Wed, 08 Mar 2023 08:29:30 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7D4D2887404; Wed, 8 Mar 2023 13:29:28 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA4BE2026D4B; Wed, 8 Mar 2023 13:29:26 +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 F015B1946A42; Wed, 8 Mar 2023 13:29:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CEE8B19465B1 for ; Wed, 8 Mar 2023 13:29:24 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BFB702166B2B; Wed, 8 Mar 2023 13:29:24 +0000 (UTC) Received: from antique-laptop.redhat.com (unknown [10.45.242.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A0E72166B26 for ; Wed, 8 Mar 2023 13:29:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678282171; 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=+2gp19n89//uKmDaoVZjE+0UyIerc23WiSi5ZILpsrY=; b=H6sM0ZUyI6lsWZuVmClaOWtMBqtTxM9Ry3GJC7XBmXS/k8X1rEBeGHv0ubUp52sh04W48v tSSfgxHll2aBzsqJhz8gxdagV+QopTnKNmuzrPN3BocHOythUW4lU5mZl6+4FfPl50yR2P rjBCR6Iz02X3+n9w7G3Kkl3Wvh+Xqsw= X-MC-Unique: mtV90K2DPHGpHZkBe376GQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 1/3] qemu_snapshot: properly ignore disks with manual snapshot Date: Wed, 8 Mar 2023 14:29:20 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.4 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: 1678282173637100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D2173142 Signed-off-by: Pavel Hrdina --- src/qemu/qemu_snapshot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index cfa531edef..7207b5879a 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -2314,7 +2314,7 @@ qemuSnapshotDeleteExternalPrepare(virDomainObj *vm, g_autofree qemuSnapshotDeleteExternalData *data =3D NULL; virDomainSnapshotDiskDef *snapDisk =3D &(snapdef->disks[i]); =20 - if (snapDisk->snapshot =3D=3D VIR_DOMAIN_SNAPSHOT_LOCATION_NO) + if (snapDisk->snapshot !=3D VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) continue; =20 if (snapDisk->snapshotDeleteInProgress) { --=20 2.39.2