forked from rpms/libvirt
76 lines
2.9 KiB
Diff
76 lines
2.9 KiB
Diff
|
From 4a0a0c37c0f3ea2c8eb6b96b07c990d7a4ce1c8b Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <4a0a0c37c0f3ea2c8eb6b96b07c990d7a4ce1c8b@dist-git>
|
||
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Date: Tue, 4 Feb 2020 15:07:51 +0100
|
||
|
|
Subject: [PATCH] qemu: checkpoint: rename disk->chkdisk in
|
||
|
|
qemuCheckpointDiscardBitmaps
|
||
|
|
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 a303e8ea47c9a2caa39ae744c0bf9a2f724a6137)
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1207659
|
||
|
|
Message-Id: <0799859ad288a747f1d12dd07bbb403053d78457.1580824112.git.pkrempa@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_checkpoint.c | 12 ++++++------
|
||
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
|
||
|
|
index 9ff3129570..d347b8fc6c 100644
|
||
|
|
--- a/src/qemu/qemu_checkpoint.c
|
||
|
|
+++ b/src/qemu/qemu_checkpoint.c
|
||
|
|
@@ -124,13 +124,13 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
|
||
|
|
return -1;
|
||
|
|
|
||
|
|
for (i = 0; i < chkdef->ndisks; i++) {
|
||
|
|
- virDomainCheckpointDiskDef *disk = &chkdef->disks[i];
|
||
|
|
+ virDomainCheckpointDiskDef *chkdisk = &chkdef->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);
|
||
|
|
+ node = qemuDomainDiskNodeFormatLookup(vm, chkdisk->name);
|
||
|
|
/* If any ancestor checkpoint has a bitmap for the same
|
||
|
|
* disk, then this bitmap must be merged to the
|
||
|
|
* ancestor. */
|
||
|
|
@@ -145,7 +145,7 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
|
||
|
|
g_autoptr(virJSONValue) arr = NULL;
|
||
|
|
|
||
|
|
disk2 = &parentdef->disks[j];
|
||
|
|
- if (STRNEQ(disk->name, disk2->name) ||
|
||
|
|
+ if (STRNEQ(chkdisk->name, disk2->name) ||
|
||
|
|
disk2->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
|
||
|
|
continue;
|
||
|
|
search_parents = false;
|
||
|
|
@@ -153,7 +153,7 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
|
||
|
|
if (!(arr = virJSONValueNewArray()))
|
||
|
|
return -1;
|
||
|
|
|
||
|
|
- if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr, node, disk->bitmap) < 0)
|
||
|
|
+ if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(arr, node, chkdisk->bitmap) < 0)
|
||
|
|
return -1;
|
||
|
|
|
||
|
|
if (chkcurrent) {
|
||
|
|
@@ -166,7 +166,7 @@ qemuCheckpointDiscardBitmaps(virDomainObjPtr vm,
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (qemuMonitorTransactionBitmapRemove(actions, node, disk->bitmap) < 0)
|
||
|
|
+ if (qemuMonitorTransactionBitmapRemove(actions, node, chkdisk->bitmap) < 0)
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.25.0
|
||
|
|
|