NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Rename qemuMigrationParamsAddTLSObjects

Browse Source 
The new name is qemuMigrationParamsEnableTLS.

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 10:45:07 +01:00
parent 594f2893d2
commit a2fae62775
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_migration.c
View File

@ -2452,9 +2452,9 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver,
* set the migration TLS parameters */ * set the migration TLS parameters */
if (flags & VIR_MIGRATE_TLS) { if (flags & VIR_MIGRATE_TLS) {
cfg = virQEMUDriverGetConfig(driver); cfg = virQEMUDriverGetConfig(driver);
if (qemuMigrationParamsAddTLSObjects(driver, vm, cfg, true, if (qemuMigrationParamsEnableTLS(driver, vm, cfg, true,
QEMU_ASYNC_JOB_MIGRATION_IN, QEMU_ASYNC_JOB_MIGRATION_IN,
&tlsAlias, &secAlias, migParams) < 0) &tlsAlias, &secAlias, migParams) < 0)
goto stopjob; goto stopjob;
/* Force reset of 'tls-hostname', it's a source only parameter */ /* Force reset of 'tls-hostname', it's a source only parameter */
@ -3407,9 +3407,9 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
if (flags & VIR_MIGRATE_TLS) { if (flags & VIR_MIGRATE_TLS) {
cfg = virQEMUDriverGetConfig(driver); cfg = virQEMUDriverGetConfig(driver);
if (qemuMigrationParamsAddTLSObjects(driver, vm, cfg, false, if (qemuMigrationParamsEnableTLS(driver, vm, cfg, false,
QEMU_ASYNC_JOB_MIGRATION_OUT, QEMU_ASYNC_JOB_MIGRATION_OUT,
&tlsAlias, &secAlias, migParams) < 0) &tlsAlias, &secAlias, migParams) < 0)
goto error; goto error;
/* We need to add tls-hostname whenever QEMU itself does not /* We need to add tls-hostname whenever QEMU itself does not

18
src/qemu/qemu_migration_params.c
View File

@ -133,7 +133,7 @@ qemuMigrationParamsSet(virQEMUDriverPtr driver,
} }
/* qemuMigrationParamsAddTLSObjects /* qemuMigrationParamsEnableTLS
* @driver: pointer to qemu driver * @driver: pointer to qemu driver
* @vm: domain object * @vm: domain object
* @cfg: configuration pointer * @cfg: configuration pointer
@ -148,14 +148,14 @@ qemuMigrationParamsSet(virQEMUDriverPtr driver,
* Returns 0 on success, -1 on failure * Returns 0 on success, -1 on failure
*/ */
int int
qemuMigrationParamsAddTLSObjects(virQEMUDriverPtr driver, qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virQEMUDriverConfigPtr cfg, virQEMUDriverConfigPtr cfg,
bool tlsListen, bool tlsListen,
int asyncJob, int asyncJob,
char **tlsAlias, char **tlsAlias,
char **secAlias, char **secAlias,
qemuMigrationParamsPtr migParams) qemuMigrationParamsPtr migParams)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virJSONValuePtr tlsProps = NULL; virJSONValuePtr tlsProps = NULL;

16
src/qemu/qemu_migration_params.h
View File

@ -72,14 +72,14 @@ qemuMigrationParamsSet(virQEMUDriverPtr driver,
qemuMigrationParamsPtr migParams); qemuMigrationParamsPtr migParams);
int int
qemuMigrationParamsAddTLSObjects(virQEMUDriverPtr driver, qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virQEMUDriverConfigPtr cfg, virQEMUDriverConfigPtr cfg,
bool tlsListen, bool tlsListen,
int asyncJob, int asyncJob,
char **tlsAlias, char **tlsAlias,
char **secAlias, char **secAlias,
qemuMigrationParamsPtr migParams); qemuMigrationParamsPtr migParams);
int int
qemuMigrationParamsDisableTLS(virDomainObjPtr vm, qemuMigrationParamsDisableTLS(virDomainObjPtr vm,