forked from rpms/libvirt
59 lines
2.4 KiB
Diff
59 lines
2.4 KiB
Diff
|
From 7a23710e912348efb55a98e7c6e6d1cc7f452b1f Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <7a23710e912348efb55a98e7c6e6d1cc7f452b1f@dist-git>
|
||
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Date: Tue, 4 Feb 2020 15:07:52 +0100
|
||
|
|
Subject: [PATCH] qemu: checkpoint: rename disk->chkdisk in
|
||
|
|
qemuCheckpointAddActions
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Upcoming patches will also use the domain disk definition. Rename disk
|
||
|
|
to chkdisk for clarity.
|
||
|
|
|
||
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
||
|
|
(cherry picked from commit f3e0a45a00465a6f19f510f7806ade1764a7e162)
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1207659
|
||
|
|
Message-Id: <ef78ad0aa581d70c4f007665cd00988796c02c8f.1580824112.git.pkrempa@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_checkpoint.c | 10 +++++-----
|
||
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
|
||
|
|
index d347b8fc6c..0aa854324b 100644
|
||
|
|
--- a/src/qemu/qemu_checkpoint.c
|
||
|
|
+++ b/src/qemu/qemu_checkpoint.c
|
||
|
|
@@ -319,13 +319,13 @@ qemuCheckpointAddActions(virDomainObjPtr vm,
|
||
|
|
bool search_parents;
|
||
|
|
|
||
|
|
for (i = 0; i < def->ndisks; i++) {
|
||
|
|
- virDomainCheckpointDiskDef *disk = &def->disks[i];
|
||
|
|
+ virDomainCheckpointDiskDef *chkdisk = &def->disks[i];
|
||
|
|
const char *node;
|
||
|
|
|
||
|
|
- if (disk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
|
||
|
|
+ if (chkdisk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
|
||
|
|
continue;
|
||
|
|
- node = qemuDomainDiskNodeFormatLookup(vm, disk->name);
|
||
|
|
- if (qemuMonitorTransactionBitmapAdd(actions, node, disk->bitmap, true, false, 0) < 0)
|
||
|
|
+ node = qemuDomainDiskNodeFormatLookup(vm, chkdisk->name);
|
||
|
|
+ if (qemuMonitorTransactionBitmapAdd(actions, node, chkdisk->bitmap, true, false, 0) < 0)
|
||
|
|
return -1;
|
||
|
|
|
||
|
|
/* We only want one active bitmap for a disk along the
|
||
|
|
@@ -345,7 +345,7 @@ qemuCheckpointAddActions(virDomainObjPtr vm,
|
||
|
|
virDomainCheckpointDiskDef *disk2;
|
||
|
|
|
||
|
|
disk2 = &olddef->disks[j];
|
||
|
|
- if (STRNEQ(disk->name, disk2->name) ||
|
||
|
|
+ if (STRNEQ(chkdisk->name, disk2->name) ||
|
||
|
|
disk2->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
|
||
|
|
continue;
|
||
|
|
if (qemuMonitorTransactionBitmapDisable(actions, node, disk2->bitmap) < 0)
|
||
|
|
--
|
||
|
|
2.25.0
|
||
|
|
|