Re: [libvirt] [PATCH v2 22/73] qemu: Hide cfg inside qemuMigrationParamsEnableTLS

[Ján Tomko]

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

There's no real reason for qemuMigrationParamsEnableTLS to require the
callers to pass a valid virQEMUDriverConfigPtr, it can just call
virQEMUDriverGetConfig.

Signed-off-by: Jiri Denemark 
---
src/qemu/qemu_migration.c| 10 ++
src/qemu/qemu_migration_params.c | 12 
src/qemu/qemu_migration_params.h |  1 -
3 files changed, 10 insertions(+), 13 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

[libvirt] [PATCH v2 22/73] qemu: Hide cfg inside qemuMigrationParamsEnableTLS

[Jiri Denemark]

There's no real reason for qemuMigrationParamsEnableTLS to require the
callers to pass a valid virQEMUDriverConfigPtr, it can just call
virQEMUDriverGetConfig.

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

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index c2cd937743..54d9dfa025 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2228,7 +2228,6 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver,
 {
 virDomainObjPtr vm = NULL;
 virObjectEventPtr event = NULL;
-virQEMUDriverConfigPtr cfg = NULL;
 int ret = -1;
 int dataFD[2] = { -1, -1 };
 qemuDomainObjPrivatePtr priv = NULL;
@@ -2451,8 +2450,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver,
 /* Migrations using TLS need to add the "tls-creds-x509" object and
  * set the migration TLS parameters */
 if (flags & VIR_MIGRATE_TLS) {
-cfg = virQEMUDriverGetConfig(driver);
-if (qemuMigrationParamsEnableTLS(driver, vm, cfg, true,
+if (qemuMigrationParamsEnableTLS(driver, vm, true,
  QEMU_ASYNC_JOB_MIGRATION_IN,
  , , NULL,
  migParams) < 0)
@@ -2549,7 +2547,6 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver,
  cleanup:
 VIR_FREE(tlsAlias);
 VIR_FREE(secAlias);
-virObjectUnref(cfg);
 qemuProcessIncomingDefFree(incoming);
 VIR_FREE(xmlout);
 VIR_FORCE_CLOSE(dataFD[0]);
@@ -3330,7 +3327,6 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
 {
 int ret = -1;
 unsigned int migrate_flags = QEMU_MONITOR_MIGRATE_BACKGROUND;
-virQEMUDriverConfigPtr cfg = NULL;
 qemuDomainObjPrivatePtr priv = vm->privateData;
 qemuMigrationCookiePtr mig = NULL;
 char *tlsAlias = NULL;
@@ -3410,8 +3406,7 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
 spec->destType == MIGRATION_DEST_FD)
 hostname = spec->dest.host.name;
 
-cfg = virQEMUDriverGetConfig(driver);
-if (qemuMigrationParamsEnableTLS(driver, vm, cfg, false,
+if (qemuMigrationParamsEnableTLS(driver, vm, false,
  QEMU_ASYNC_JOB_MIGRATION_OUT,
  , , hostname,
  migParams) < 0)
@@ -3649,7 +3644,6 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
  cleanup:
 VIR_FREE(tlsAlias);
 VIR_FREE(secAlias);
-virObjectUnref(cfg);
 VIR_FORCE_CLOSE(fd);
 virDomainDefFree(persistDef);
 qemuMigrationCookieFree(mig);
diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index 476687aae2..dd8cf68842 100644
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -136,7 +136,6 @@ qemuMigrationParamsSet(virQEMUDriverPtr driver,
 /* qemuMigrationParamsEnableTLS
  * @driver: pointer to qemu driver
  * @vm: domain object
- * @cfg: configuration pointer
  * @tlsListen: server or client
  * @asyncJob: Migration job to join
  * @tlsAlias: alias to be generated for TLS object
@@ -153,7 +152,6 @@ qemuMigrationParamsSet(virQEMUDriverPtr driver,
 int
 qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver,
  virDomainObjPtr vm,
- virQEMUDriverConfigPtr cfg,
  bool tlsListen,
  int asyncJob,
  char **tlsAlias,
@@ -164,6 +162,8 @@ qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver,
 qemuDomainObjPrivatePtr priv = vm->privateData;
 virJSONValuePtr tlsProps = NULL;
 virJSONValuePtr secProps = NULL;
+virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
+int ret = -1;
 
 if (!cfg->migrateTLSx509certdir) {
 virReportError(VIR_ERR_OPERATION_INVALID, "%s",
@@ -206,12 +206,16 @@ qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver,
 VIR_STRDUP(migParams->params.tlsHostname, hostname ? hostname : "") < 
0)
 goto error;
 
-return 0;
+ret = 0;
+
+ cleanup:
+virObjectUnref(cfg);
+return ret;
 
  error:
 virJSONValueFree(tlsProps);
 virJSONValueFree(secProps);
-return -1;
+goto cleanup;
 }
 
 
diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h
index 6535c3af47..e8323dc9bb 100644
--- a/src/qemu/qemu_migration_params.h
+++ b/src/qemu/qemu_migration_params.h
@@ -74,7 +74,6 @@ qemuMigrationParamsSet(virQEMUDriverPtr driver,
 int
 qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver,
  virDomainObjPtr vm,
- virQEMUDriverConfigPtr cfg,
  bool tlsListen,
  int asyncJob,