External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Rename qemuMigrationParamsSet

Browse Source 
The new name is qemuMigrationParamsApply and it will soon become the
only API which will send all requested migration parameters and
capabilities to QEMU. All other qemuMigrationParams* APIs will just
operate on the qemuMigrationParams structure.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2018-02-28 14:44:12 +01:00
parent 0beaadfa6e
commit 4bac1879ce
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_migration.c
View File

@ -2476,8 +2476,8 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver,
QEMU_ASYNC_JOB_MIGRATION_IN) < 0) QEMU_ASYNC_JOB_MIGRATION_IN) < 0)
goto stopjob; goto stopjob;
if (qemuMigrationParamsSet(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, if (qemuMigrationParamsApply(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN,
migParams) < 0) migParams) < 0)
goto stopjob; goto stopjob;
if (mig->nbd && if (mig->nbd &&
@ -3471,8 +3471,8 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
true, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) true, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0)
goto error; goto error;
if (qemuMigrationParamsSet(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, if (qemuMigrationParamsApply(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT,
migParams) < 0) migParams) < 0)
goto error; goto error;
if (qemuDomainObjEnterMonitorAsync(driver, vm, if (qemuDomainObjEnterMonitorAsync(driver, vm,

21
src/qemu/qemu_migration_params.c
View File

@ -108,11 +108,22 @@ qemuMigrationParamsFromFlags(virTypedParameterPtr params,
} }
/**
* qemuMigrationParamsApply
* @driver: qemu driver
* @vm: domain object
* @asyncJob: migration job
* @migParams: migration parameters to send to QEMU
*
* Send all parameters stored in @migParams to QEMU.
*
* Returns 0 on success, -1 on failure.
*/
int int
qemuMigrationParamsSet(virQEMUDriverPtr driver, qemuMigrationParamsApply(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
int asyncJob, int asyncJob,
qemuMigrationParamsPtr migParams) qemuMigrationParamsPtr migParams)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
int ret = -1; int ret = -1;
@ -391,7 +402,7 @@ qemuMigrationParamsReset(virQEMUDriverPtr driver,
goto cleanup; goto cleanup;
if (origParams) { if (origParams) {
if (qemuMigrationParamsSet(driver, vm, asyncJob, origParams) < 0) if (qemuMigrationParamsApply(driver, vm, asyncJob, origParams) < 0)
goto cleanup; goto cleanup;
qemuMigrationParamsResetTLS(driver, vm, asyncJob, origParams); qemuMigrationParamsResetTLS(driver, vm, asyncJob, origParams);
} }

8
src/qemu/qemu_migration_params.h
View File

@ -66,10 +66,10 @@ void
qemuMigrationParamsFree(qemuMigrationParamsPtr migParams); qemuMigrationParamsFree(qemuMigrationParamsPtr migParams);
int int
qemuMigrationParamsSet(virQEMUDriverPtr driver, qemuMigrationParamsApply(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
int asyncJob, int asyncJob,
qemuMigrationParamsPtr migParams); qemuMigrationParamsPtr migParams);
int int
qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver, qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver,