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

On 3/11/20 7:55 AM, Peter Krempa wrote:
> 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>
> ---
>   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 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;

Shouldn't this go in now regardless of whether the rest of the series is 
still waiting on qemu?

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org