[PATCH 4/5] qemuDomainBlockPivot: Rename 'actions' to 'bitmapactions'

There are two possible 'transaction' command arguments in the function. Rename 'actions' as they deal with creating bitmaps only. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_driver.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f5074cb151..348ef17141 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17319,7 +17319,7 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); - g_autoptr(virJSONValue) actions = NULL; + g_autoptr(virJSONValue) bitmapactions = NULL; g_autoptr(virJSONValue) reopenactions = NULL; if (job->state != QEMU_BLOCKJOB_STATE_READY) { @@ -17352,9 +17352,9 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, bool shallow = job->jobflags & VIR_DOMAIN_BLOCK_COPY_SHALLOW; bool reuse = job->jobflags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT; - actions = virJSONValueNewArray(); + bitmapactions = virJSONValueNewArray(); - if (qemuMonitorTransactionBitmapAdd(actions, + if (qemuMonitorTransactionBitmapAdd(bitmapactions, disk->mirror->nodeformat, "libvirt-tmp-activewrite", false, @@ -17387,9 +17387,9 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT: if (blockdev) { - actions = virJSONValueNewArray(); + bitmapactions = virJSONValueNewArray(); - if (qemuMonitorTransactionBitmapAdd(actions, + if (qemuMonitorTransactionBitmapAdd(bitmapactions, job->data.commit.base->nodeformat, "libvirt-tmp-activewrite", false, @@ -17413,8 +17413,8 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, } } - if (actions && rc == 0) - rc = qemuMonitorTransaction(priv->mon, &actions); + if (bitmapactions && rc == 0) + rc = qemuMonitorTransaction(priv->mon, &bitmapactions); if (rc == 0) ret = qemuMonitorJobComplete(priv->mon, job->name); -- 2.26.2