[libvirt PATCH 3/6] qemu: Rename remoteCaps parameter in qemuMigrationParamsCheck

The migration cookie contains two bitmaps of migration capabilities: supported and automatic. qemuMigrationParamsCheck expects the letter so lets make it more obvious by renaming the parameter as remoteAuto. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/qemu/qemu_migration_params.c | 6 +++--- src/qemu/qemu_migration_params.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index b02a8af8d5..f441c59d67 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -1290,7 +1290,7 @@ int qemuMigrationParamsCheck(virDomainObj *vm, int asyncJob, qemuMigrationParams *migParams, - virBitmap *remoteCaps) + virBitmap *remoteAuto) { qemuDomainJobPrivate *jobPriv = vm->job->privateData; qemuMigrationCapability cap; @@ -1323,8 +1323,8 @@ qemuMigrationParamsCheck(virDomainObj *vm, if (qemuMigrationParamsAlwaysOn[i].party != party) { bool remote = false; - if (remoteCaps) - ignore_value(virBitmapGetBit(remoteCaps, cap, &remote)); + if (remoteAuto) + ignore_value(virBitmapGetBit(remoteAuto, cap, &remote)); if (!remote) { VIR_DEBUG("Not enabling migration capability '%s'; it is " diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h index 5857673227..44f5c2a882 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -142,7 +142,7 @@ int qemuMigrationParamsCheck(virDomainObj *vm, int asyncJob, qemuMigrationParams *migParams, - virBitmap *remoteCaps); + virBitmap *remoteAuto); void qemuMigrationParamsReset(virDomainObj *vm, -- 2.43.0