From 31a752d5bdd63d431b619ec5045b431fc3ca6bef Mon Sep 17 00:00:00 2001
Message-Id: <31a752d5bdd63d431b619ec5045b431fc3ca6bef@dist-git>
From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 21 Jul 2020 13:56:24 +0200
Subject: [PATCH] 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@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit 24ac1a7c04fded2f8639478abead72bb57506162)

rhel-8.3: https://bugzilla.redhat.com/show_bug.cgi?id=1857779
rhel-av-8.2.1: not cloned yet
Message-Id: <6a3969721f1e701a16eb3679dcc37c9908c753ae.1595332476.git.pkrempa@redhat.com>

Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---
 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 ad5ef7d67d..454d7b1c16 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -17564,7 +17564,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) {
@@ -17597,9 +17597,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,
@@ -17632,9 +17632,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,
@@ -17658,8 +17658,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.27.0