From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 18 Sep 2019 12:48:57 +0000 (+0200)
Subject: qemu: checkpoint: Enforce that 'bitmap' name must match checkpoint name
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fefb2d743af38d2199cf01bac59df8c8e44c6683;p=libvirt.git

qemu: checkpoint: Enforce that 'bitmap' name must match checkpoint name

Prevent insane configurations by enforcing that disk bitmap for a
checkpoint must match the name of the checkpoint.

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

diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
index 4a618f5236..3abbab1514 100644
--- a/src/qemu/qemu_checkpoint.c
+++ b/src/qemu/qemu_checkpoint.c
@@ -270,6 +270,13 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver,
         if (disk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
             continue;
 
+        if (STRNEQ(disk->bitmap, def->parent.name)) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("bitmap for disk '%s' must match checkpoint name '%s'"),
+                           disk->name, def->parent.name);
+            goto cleanup;
+        }
+
         if (vm->def->disks[i]->src->format != VIR_STORAGE_FILE_QCOW2) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("checkpoint for disk %s unsupported "