提交 0a19675b 编写于 作者: J Jiri Denemark

qemu: Rename qemuMigrationAnyCapsGet as qemuMigrationCapsGet

Signed-off-by: NJiri Denemark <jdenemar@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 4962fd96
...@@ -13593,7 +13593,7 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom, ...@@ -13593,7 +13593,7 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom,
priv = vm->privateData; priv = vm->privateData;
if (!qemuMigrationAnyCapsGet(vm, QEMU_MONITOR_MIGRATION_CAPS_XBZRLE)) { if (!qemuMigrationCapsGet(vm, QEMU_MONITOR_MIGRATION_CAPS_XBZRLE)) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("Compressed migration is not supported by " _("Compressed migration is not supported by "
"QEMU binary")); "QEMU binary"));
...@@ -13644,7 +13644,7 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom, ...@@ -13644,7 +13644,7 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom,
priv = vm->privateData; priv = vm->privateData;
if (!qemuMigrationAnyCapsGet(vm, QEMU_MONITOR_MIGRATION_CAPS_XBZRLE)) { if (!qemuMigrationCapsGet(vm, QEMU_MONITOR_MIGRATION_CAPS_XBZRLE)) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("Compressed migration is not supported by " _("Compressed migration is not supported by "
"QEMU binary")); "QEMU binary"));
......
...@@ -1335,7 +1335,7 @@ qemuMigrationOptionSet(virQEMUDriverPtr driver, ...@@ -1335,7 +1335,7 @@ qemuMigrationOptionSet(virQEMUDriverPtr driver,
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
int ret; int ret;
if (!qemuMigrationAnyCapsGet(vm, capability)) { if (!qemuMigrationCapsGet(vm, capability)) {
if (!state) { if (!state) {
/* Unsupported but we want it off anyway */ /* Unsupported but we want it off anyway */
return 0; return 0;
...@@ -3869,7 +3869,7 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver, ...@@ -3869,7 +3869,7 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) QEMU_ASYNC_JOB_MIGRATION_OUT) < 0)
goto error; goto error;
if (qemuMigrationAnyCapsGet(vm, QEMU_MONITOR_MIGRATION_CAPS_PAUSE_BEFORE_SWITCHOVER) && if (qemuMigrationCapsGet(vm, QEMU_MONITOR_MIGRATION_CAPS_PAUSE_BEFORE_SWITCHOVER) &&
qemuMigrationOptionSet(driver, vm, qemuMigrationOptionSet(driver, vm,
QEMU_MONITOR_MIGRATION_CAPS_PAUSE_BEFORE_SWITCHOVER, QEMU_MONITOR_MIGRATION_CAPS_PAUSE_BEFORE_SWITCHOVER,
true, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) true, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0)
...@@ -6095,7 +6095,7 @@ qemuMigrationParamsReset(virQEMUDriverPtr driver, ...@@ -6095,7 +6095,7 @@ qemuMigrationParamsReset(virQEMUDriverPtr driver,
goto cleanup; goto cleanup;
for (cap = 0; cap < QEMU_MONITOR_MIGRATION_CAPS_LAST; cap++) { for (cap = 0; cap < QEMU_MONITOR_MIGRATION_CAPS_LAST; cap++) {
if (qemuMigrationAnyCapsGet(vm, cap) && if (qemuMigrationCapsGet(vm, cap) &&
qemuMigrationOptionSet(driver, vm, cap, false, job) < 0) qemuMigrationOptionSet(driver, vm, cap, false, job) < 0)
goto cleanup; goto cleanup;
} }
...@@ -6160,8 +6160,8 @@ qemuMigrationSrcFetchMirrorStats(virQEMUDriverPtr driver, ...@@ -6160,8 +6160,8 @@ qemuMigrationSrcFetchMirrorStats(virQEMUDriverPtr driver,
bool bool
qemuMigrationAnyCapsGet(virDomainObjPtr vm, qemuMigrationCapsGet(virDomainObjPtr vm,
qemuMonitorMigrationCaps cap) qemuMonitorMigrationCaps cap)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
bool enabled = false; bool enabled = false;
......
...@@ -309,7 +309,7 @@ qemuMigrationSrcFetchMirrorStats(virQEMUDriverPtr driver, ...@@ -309,7 +309,7 @@ qemuMigrationSrcFetchMirrorStats(virQEMUDriverPtr driver,
qemuDomainJobInfoPtr jobInfo); qemuDomainJobInfoPtr jobInfo);
bool bool
qemuMigrationAnyCapsGet(virDomainObjPtr vm, qemuMigrationCapsGet(virDomainObjPtr vm,
qemuMonitorMigrationCaps cap); qemuMonitorMigrationCaps cap);
#endif /* __QEMU_MIGRATION_H__ */ #endif /* __QEMU_MIGRATION_H__ */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册