[libvirt] [PATCH v2 20/73] qemu: Rename qemuMigrationParamsAddTLSObjects

2018-04-15 Thread Jiri Denemark
The new name is qemuMigrationParamsEnableTLS.

Signed-off-by: Jiri Denemark 
---
 src/qemu/qemu_migration.c| 12 ++--
 src/qemu/qemu_migration_params.c | 18 +-
 src/qemu/qemu_migration_params.h | 16 
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index efc5734b1a..9a9a881f9b 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2452,9 +2452,9 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver,
  * set the migration TLS parameters */
 if (flags & VIR_MIGRATE_TLS) {
 cfg = virQEMUDriverGetConfig(driver);
-if (qemuMigrationParamsAddTLSObjects(driver, vm, cfg, true,
- QEMU_ASYNC_JOB_MIGRATION_IN,
- , , migParams) 
< 0)
+if (qemuMigrationParamsEnableTLS(driver, vm, cfg, true,
+ QEMU_ASYNC_JOB_MIGRATION_IN,
+ , , migParams) < 0)
 goto stopjob;
 
 /* Force reset of 'tls-hostname', it's a source only parameter */
@@ -3407,9 +3407,9 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
 
 if (flags & VIR_MIGRATE_TLS) {
 cfg = virQEMUDriverGetConfig(driver);
-if (qemuMigrationParamsAddTLSObjects(driver, vm, cfg, false,
- QEMU_ASYNC_JOB_MIGRATION_OUT,
- , , migParams) 
< 0)
+if (qemuMigrationParamsEnableTLS(driver, vm, cfg, false,
+ QEMU_ASYNC_JOB_MIGRATION_OUT,
+ , , migParams) < 0)
 goto error;
 
 /* We need to add tls-hostname whenever QEMU itself does not
diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index 1f3549a7b4..bb3bbc30f3 100644
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -133,7 +133,7 @@ qemuMigrationParamsSet(virQEMUDriverPtr driver,
 }
 
 
-/* qemuMigrationParamsAddTLSObjects
+/* qemuMigrationParamsEnableTLS
  * @driver: pointer to qemu driver
  * @vm: domain object
  * @cfg: configuration pointer
@@ -148,14 +148,14 @@ qemuMigrationParamsSet(virQEMUDriverPtr driver,
  * Returns 0 on success, -1 on failure
  */
 int
-qemuMigrationParamsAddTLSObjects(virQEMUDriverPtr driver,
- virDomainObjPtr vm,
- virQEMUDriverConfigPtr cfg,
- bool tlsListen,
- int asyncJob,
- char **tlsAlias,
- char **secAlias,
- qemuMigrationParamsPtr migParams)
+qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver,
+ virDomainObjPtr vm,
+ virQEMUDriverConfigPtr cfg,
+ bool tlsListen,
+ int asyncJob,
+ char **tlsAlias,
+ char **secAlias,
+ qemuMigrationParamsPtr migParams)
 {
 qemuDomainObjPrivatePtr priv = vm->privateData;
 virJSONValuePtr tlsProps = NULL;
diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h
index 4eefe409df..6f3fb67949 100644
--- a/src/qemu/qemu_migration_params.h
+++ b/src/qemu/qemu_migration_params.h
@@ -72,14 +72,14 @@ qemuMigrationParamsSet(virQEMUDriverPtr driver,
qemuMigrationParamsPtr migParams);
 
 int
-qemuMigrationParamsAddTLSObjects(virQEMUDriverPtr driver,
- virDomainObjPtr vm,
- virQEMUDriverConfigPtr cfg,
- bool tlsListen,
- int asyncJob,
- char **tlsAlias,
- char **secAlias,
- qemuMigrationParamsPtr migParams);
+qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver,
+ virDomainObjPtr vm,
+ virQEMUDriverConfigPtr cfg,
+ bool tlsListen,
+ int asyncJob,
+ char **tlsAlias,
+ char **secAlias,
+ qemuMigrationParamsPtr migParams);
 
 int
 qemuMigrationParamsDisableTLS(virDomainObjPtr vm,
-- 
2.17.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list


Re: [libvirt] [PATCH v2 20/73] qemu: Rename qemuMigrationParamsAddTLSObjects

2018-04-13 Thread Ján Tomko

On Wed, Apr 11, 2018 at 04:41:10PM +0200, Jiri Denemark wrote:

The new name is qemuMigrationParamsEnableTLS.

Signed-off-by: Jiri Denemark 
---
src/qemu/qemu_migration.c| 12 ++--
src/qemu/qemu_migration_params.c | 18 +-
src/qemu/qemu_migration_params.h | 16 
3 files changed, 23 insertions(+), 23 deletions(-)



Reviewed-by: Ján Tomko 

Jano


signature.asc
Description: Digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list