From ec3392c1d5a9886279ee086ee3d421106b9b1e32 Mon Sep 17 00:00:00 2001
Message-Id: <ec3392c1d5a9886279ee086ee3d421106b9b1e32@dist-git>
From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 16 Mar 2020 22:12:18 +0100
Subject: [PATCH] qemuCheckpointDiscardBitmaps: Use correct field for
 checkpoint bitmap name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The code deleting checkpoints needs the name of the parent checkpoint's
disk's bitmap but was using the disk alias instead. This would create
wrong bitmaps after deleting some checkpoints.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit 0ce8b0fbe2d0cbaf26da0402270720b776ebfb0f)
https://bugzilla.redhat.com/show_bug.cgi?id=1799013
Message-Id: <c32db1af44e71870d172233acdfddf050ed73441.1584391727.git.pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_checkpoint.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
index 6e3a432022..19822bd74d 100644
--- a/src/qemu/qemu_checkpoint.c
+++ b/src/qemu/qemu_checkpoint.c
@@ -285,7 +285,7 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
          * ancestor. */
         if ((parentchkdisk = qemuCheckpointFindActiveDiskInParent(vm, parent,
                                                                   chkdisk->name)))
-            parentbitmap = parentchkdisk->name;
+            parentbitmap = parentchkdisk->bitmap;
 
         if (qemuCheckpointDiscardDiskBitmaps(domdisk->src, blockNamedNodeData,
                                              chkdisk->bitmap, parentbitmap,
-- 
2.25.1