From nobody Sun Feb 8 07:14:44 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=1693557157; cv=none; d=zohomail.com; s=zohoarc; b=hiSPJoll6CRic6qUYYmoB6DMTmgYaElzIYSqLKX/8R589MvlEttOczCxf6aJsOLSSGeUZzhZVbcEh0n7XifW9jr/Ya7v7SHIgRbsouykaLVDYiEbqZ277mwePNcYiysqReF8hvt5d/IWGx2upm5IMW8y3JX+12ld4OiuiGuiX0Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693557157; 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=FHZnQuy0dwYJom25iTlkgE5yKc0Yw49dhF0V1witXEE=; b=Eh2xRP9ZCXZJtcK25hrwRSiEnxae8IxR4Xt2QYo0YvrrKqThQIZk922eeD9qpeyhC89dtMri4ZlKqZXpbkL7jUud0Y/Kd8ItK5ijP7ezyX8RXKQ6Rsor/wV596uODfZNA4Yo0/1uPqH6Kl13vnpzmstdQ54GoblUoQ6XqkWB83s= 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 169355715699749.20461678136667; Fri, 1 Sep 2023 01:32:36 -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-527-2U9GKZj7O0ql6rp5HuhZ5Q-1; Fri, 01 Sep 2023 04:32:33 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 66927823D6C; Fri, 1 Sep 2023 08:32:31 +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 B8E9A40C2072; Fri, 1 Sep 2023 08:32:30 +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 968B919472AD; Fri, 1 Sep 2023 08:32:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E544019465B7 for ; Fri, 1 Sep 2023 08:32:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D521BC15BAE; Fri, 1 Sep 2023 08:32:23 +0000 (UTC) Received: from localhost.localdomain (unknown [10.45.225.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 785E0C15BAD for ; Fri, 1 Sep 2023 08:32:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693557156; 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=FHZnQuy0dwYJom25iTlkgE5yKc0Yw49dhF0V1witXEE=; b=EeD2aDA3WfXj7pbzSP/BpoJa+6rkZN6f908ErBIOuJ/r26LLKw/xTlbuti88BoV2TXCr0v 9HjDJn1HIDzrUicWZoOu5tFMvEwJyDKzPl7ZiOf/cfXd2Qogtw22QTz4tjDFucEVX0cmPt jtGfoRm6aoTCZw9VMYIW/g1FHtIRQQk= X-MC-Unique: 2U9GKZj7O0ql6rp5HuhZ5Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH v2 1/6] qemu_snapshot: fix reverting external snapshot when not all disks are included Date: Fri, 1 Sep 2023 10:32:12 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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.1 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: 1693557158542100001 Content-Type: text/plain; charset="utf-8"; x-default="true" We need to skip all disks that have snapshot type other than 'external'. Signed-off-by: Pavel Hrdina --- src/qemu/qemu_snapshot.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index d943281e35..ff85d56572 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -2058,6 +2058,9 @@ qemuSnapshotRevertExternalPrepare(virDomainObj *vm, virDomainSnapshotDiskDef *snapdisk =3D &tmpsnapdef->disks[i]; virDomainDiskDef *domdisk =3D domdef->disks[i]; =20 + if (snapdisk->snapshot !=3D VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) + continue; + if (qemuSnapshotPrepareDiskExternal(domdisk, snapdisk, active, fal= se) < 0) return -1; } @@ -2098,6 +2101,9 @@ qemuSnapshotRevertExternalActive(virDomainObj *vm, return -1; =20 for (i =3D 0; i < tmpsnapdef->ndisks; i++) { + if (tmpsnapdef->disks[i].snapshot !=3D VIR_DOMAIN_SNAPSHOT_LOCATIO= N_EXTERNAL) + continue; + if (qemuSnapshotDiskPrepareOne(snapctxt, vm->def->disks[i], tmpsnapdef->disks + i, @@ -2188,6 +2194,9 @@ qemuSnapshotRevertExternalFinish(virDomainObj *vm, for (i =3D 0; i < curdef->nrevertdisks; i++) { virDomainSnapshotDiskDef *snapdisk =3D &(curdef->revertdisks[i= ]); =20 + if (snapdisk->snapshot !=3D VIR_DOMAIN_SNAPSHOT_LOCATION_EXTER= NAL) + continue; + if (virStorageSourceInit(snapdisk->src) < 0 || virStorageSourceUnlink(snapdisk->src) < 0) { VIR_WARN("Failed to remove snapshot image '%s'", @@ -2203,6 +2212,9 @@ qemuSnapshotRevertExternalFinish(virDomainObj *vm, for (i =3D 0; i < curdef->ndisks; i++) { virDomainSnapshotDiskDef *snapdisk =3D &(curdef->disks[i]); =20 + if (snapdisk->snapshot !=3D VIR_DOMAIN_SNAPSHOT_LOCATION_EXTER= NAL) + continue; + if (virStorageSourceInit(snapdisk->src) < 0 || virStorageSourceUnlink(snapdisk->src) < 0) { VIR_WARN("Failed to remove snapshot image '%s'", --=20 2.41.0