|
 |
ad1c90 |
From 31a752d5bdd63d431b619ec5045b431fc3ca6bef Mon Sep 17 00:00:00 2001
|
|
|
ad1c90 |
Message-Id: <31a752d5bdd63d431b619ec5045b431fc3ca6bef@dist-git>
|
|
|
ad1c90 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
ad1c90 |
Date: Tue, 21 Jul 2020 13:56:24 +0200
|
|
|
ad1c90 |
Subject: [PATCH] qemuDomainBlockPivot: Rename 'actions' to 'bitmapactions'
|
|
|
ad1c90 |
|
|
|
ad1c90 |
There are two possible 'transaction' command arguments in the function.
|
|
|
ad1c90 |
Rename 'actions' as they deal with creating bitmaps only.
|
|
|
ad1c90 |
|
|
|
ad1c90 |
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
ad1c90 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
ad1c90 |
(cherry picked from commit 24ac1a7c04fded2f8639478abead72bb57506162)
|
|
|
ad1c90 |
|
|
|
ad1c90 |
rhel-8.3: https://bugzilla.redhat.com/show_bug.cgi?id=1857779
|
|
|
ad1c90 |
rhel-av-8.2.1: not cloned yet
|
|
|
ad1c90 |
Message-Id: <6a3969721f1e701a16eb3679dcc37c9908c753ae.1595332476.git.pkrempa@redhat.com>
|
|
|
ad1c90 |
|
|
|
ad1c90 |
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
ad1c90 |
---
|
|
|
ad1c90 |
src/qemu/qemu_driver.c | 14 +++++++-------
|
|
|
ad1c90 |
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
ad1c90 |
|
|
|
ad1c90 |
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
|
ad1c90 |
index ad5ef7d67d..454d7b1c16 100644
|
|
|
ad1c90 |
--- a/src/qemu/qemu_driver.c
|
|
|
ad1c90 |
+++ b/src/qemu/qemu_driver.c
|
|
|
ad1c90 |
@@ -17564,7 +17564,7 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
|
|
|
ad1c90 |
int ret = -1;
|
|
|
ad1c90 |
qemuDomainObjPrivatePtr priv = vm->privateData;
|
|
|
ad1c90 |
bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
|
|
|
ad1c90 |
- g_autoptr(virJSONValue) actions = NULL;
|
|
|
ad1c90 |
+ g_autoptr(virJSONValue) bitmapactions = NULL;
|
|
|
ad1c90 |
g_autoptr(virJSONValue) reopenactions = NULL;
|
|
|
ad1c90 |
|
|
|
ad1c90 |
if (job->state != QEMU_BLOCKJOB_STATE_READY) {
|
|
|
ad1c90 |
@@ -17597,9 +17597,9 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
|
|
|
ad1c90 |
bool shallow = job->jobflags & VIR_DOMAIN_BLOCK_COPY_SHALLOW;
|
|
|
ad1c90 |
bool reuse = job->jobflags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT;
|
|
|
ad1c90 |
|
|
|
ad1c90 |
- actions = virJSONValueNewArray();
|
|
|
ad1c90 |
+ bitmapactions = virJSONValueNewArray();
|
|
|
ad1c90 |
|
|
|
ad1c90 |
- if (qemuMonitorTransactionBitmapAdd(actions,
|
|
|
ad1c90 |
+ if (qemuMonitorTransactionBitmapAdd(bitmapactions,
|
|
|
ad1c90 |
disk->mirror->nodeformat,
|
|
|
ad1c90 |
"libvirt-tmp-activewrite",
|
|
|
ad1c90 |
false,
|
|
|
ad1c90 |
@@ -17632,9 +17632,9 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
|
|
|
ad1c90 |
|
|
|
ad1c90 |
case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT:
|
|
|
ad1c90 |
if (blockdev) {
|
|
|
ad1c90 |
- actions = virJSONValueNewArray();
|
|
|
ad1c90 |
+ bitmapactions = virJSONValueNewArray();
|
|
|
ad1c90 |
|
|
|
ad1c90 |
- if (qemuMonitorTransactionBitmapAdd(actions,
|
|
|
ad1c90 |
+ if (qemuMonitorTransactionBitmapAdd(bitmapactions,
|
|
|
ad1c90 |
job->data.commit.base->nodeformat,
|
|
|
ad1c90 |
"libvirt-tmp-activewrite",
|
|
|
ad1c90 |
false,
|
|
|
ad1c90 |
@@ -17658,8 +17658,8 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver,
|
|
|
ad1c90 |
}
|
|
|
ad1c90 |
}
|
|
|
ad1c90 |
|
|
|
ad1c90 |
- if (actions && rc == 0)
|
|
|
ad1c90 |
- rc = qemuMonitorTransaction(priv->mon, &actions);
|
|
|
ad1c90 |
+ if (bitmapactions && rc == 0)
|
|
|
ad1c90 |
+ rc = qemuMonitorTransaction(priv->mon, &bitmapactions);
|
|
|
ad1c90 |
|
|
|
ad1c90 |
if (rc == 0)
|
|
|
ad1c90 |
ret = qemuMonitorJobComplete(priv->mon, job->name);
|
|
|
ad1c90 |
--
|
|
|
ad1c90 |
2.27.0
|
|
|
ad1c90 |
|