From a6c7e55570889c091b92b65e34bf057bb31d4c58 Mon Sep 17 00:00:00 2001
From: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>
Date: Wed, 18 Mar 2026 09:23:52 +0530
Subject: [PATCH] fix export bitmap in start backup of running vm

---
 .../resource/wrapper/LibvirtStartBackupCommandWrapper.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStartBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStartBackupCommandWrapper.java
index 04416559c57..4ed39f1ae89 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStartBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStartBackupCommandWrapper.java
@@ -112,6 +112,10 @@ public class LibvirtStartBackupCommandWrapper extends CommandWrapper<StartBackup
         if (dumpScript.execute() == null) {
             return null;
         }
+        if (fromCheckpointCreateTime == null) {
+            return new StartBackupAnswer(cmd, false, "From checkpoint create time is null for checkpoint " + fromCheckpointId);
+        }
+
         String redefineXml = createCheckpointXmlForRedefine(fromCheckpointId, fromCheckpointCreateTime);
         File redefineFile;
         try {
@@ -171,8 +175,7 @@ public class LibvirtStartBackupCommandWrapper extends CommandWrapper<StartBackup
             String scratchFile = "/var/tmp/scratch-" + export + ".qcow2";
             xml.append("    <disk name=\"").append(diskName).append("\" type=\"file\" exportname=\"").append(export);
             if (StringUtils.isNotBlank(fromCheckpointId)) {
-                String exportBitmap = export + "-" + fromCheckpointId.substring(0, 4);
-                xml.append("\" exportbitmap=\"").append(exportBitmap);
+                xml.append("\" exportbitmap=\"").append(fromCheckpointId);
             }
             xml.append("\">\n");
             xml.append("      <scratch file=\"").append(scratchFile).append("\"/>\n");