openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: Drop qemuMigrationParamsSetCapability 

It's become only a tiny wrapper around virBitmapSetBit, which can easily
be called directly. We don't need to call virBitmapClearBit since
migParams->caps bitmap is initialized with zeros.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2018-03-27 23:41:10 +02:00
parent 1b392a1cbf
commit 0809f1bac4
1 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/qemu/qemu_migration_params.c
View File

@ -229,21 +229,6 @@ qemuMigrationParamsApply(virQEMUDriverPtr driver,
}
static int
qemuMigrationParamsSetCapability(virDomainObjPtr vm ATTRIBUTE_UNUSED,
qemuMonitorMigrationCaps capability,
bool state,
qemuMigrationParamsPtr migParams)
{
if (state)
ignore_value(virBitmapSetBit(migParams->caps, capability));
else
ignore_value(virBitmapClearBit(migParams->caps, capability));
return 0;
}
/* qemuMigrationParamsEnableTLS
* @driver: pointer to qemu driver
* @vm: domain object
@ -358,23 +343,17 @@ qemuMigrationParamsDisableTLS(virDomainObjPtr vm,
int
qemuMigrationParamsSetCompression(virDomainObjPtr vm,
qemuMigrationParamsSetCompression(virDomainObjPtr vm ATTRIBUTE_UNUSED,
qemuMigrationCompressionPtr compression,
qemuMigrationParamsPtr migParams)
{
if (qemuMigrationParamsSetCapability(vm,
QEMU_MONITOR_MIGRATION_CAPS_XBZRLE,
compression->methods &
(1ULL << QEMU_MIGRATION_COMPRESS_XBZRLE),
migParams) < 0)
return -1;
if (compression->methods & (1ULL << QEMU_MIGRATION_COMPRESS_XBZRLE))
ignore_value(virBitmapSetBit(migParams->caps,
QEMU_MONITOR_MIGRATION_CAPS_XBZRLE));
if (qemuMigrationParamsSetCapability(vm,
QEMU_MONITOR_MIGRATION_CAPS_COMPRESS,
compression->methods &
(1ULL << QEMU_MIGRATION_COMPRESS_MT),
migParams) < 0)
return -1;
if (compression->methods & (1ULL << QEMU_MIGRATION_COMPRESS_MT))
ignore_value(virBitmapSetBit(migParams->caps,
QEMU_MONITOR_MIGRATION_CAPS_COMPRESS));
migParams->params.compressLevel_set = compression->level_set;
migParams->params.compressLevel = compression->level;