From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 24 Feb 2020 16:30:26 +0000 (+0100)
Subject: qemuCheckpointDiscardBitmaps: Use correct field for checkpoint bitmap name
X-Git-Tag: v6.2.0-rc1~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ce8b0fbe2d0cbaf26da0402270720b776ebfb0f;p=thirdparty%2Flibvirt.git

qemuCheckpointDiscardBitmaps: Use correct field for checkpoint bitmap name

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>
---

diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
index 5890deb471..76f10a701e 100644
--- a/src/qemu/qemu_checkpoint.c
+++ b/src/qemu/qemu_checkpoint.c
@@ -283,7 +283,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,