From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 22 Mar 2021 13:44:55 +0000 (+0100)
Subject: virDomainCheckpointRedefinePrep: Assign default bitmap names when domain XML is missing
X-Git-Tag: v7.2.0-rc1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fdc37711b42cd8cd75f2903629f990c74d67ad0;p=thirdparty%2Flibvirt.git

virDomainCheckpointRedefinePrep: Assign default bitmap names when domain XML is missing

Previously we'd assign the default checkpoint bitmap names in
virDomainCheckpointAlignDisks. In cases when the checkpoint is redefined
without a domain XML virDomainCheckpointAlignDisks is not called.

Add an explicit call to virDomainCheckpointDefAssignBitmapNames to
restore functionality.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c
index f8704852e0..cd48570b51 100644
--- a/src/conf/checkpoint_conf.c
+++ b/src/conf/checkpoint_conf.c
@@ -508,6 +508,9 @@ virDomainCheckpointRedefinePrep(virDomainObjPtr vm,
 
         if (virDomainCheckpointAlignDisks(def) < 0)
             return -1;
+    } else {
+        if (virDomainCheckpointDefAssignBitmapNames(def) < 0)
+            return -1;
     }
 
     if (def->parent.parent_name &&