External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 12:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuDomainBlockPivot: Rename 'actions' to 'bitmapactions'

Browse Source 
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>
This commit is contained in:
Peter Krempa 2020-07-16 15:13:17 +02:00
parent 9d039863e2
commit 24ac1a7c04
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_driver.c
View File

@ -17320,7 +17320,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) {
@ -17353,9 +17353,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,
@ -17388,9 +17388,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,
@ -17414,8 +17414,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);