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