]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Implement VIR_MIGRATE_PARAM_TLS_DESTINATION
authorJiri Denemark <jdenemar@redhat.com>
Tue, 3 Dec 2019 15:20:35 +0000 (16:20 +0100)
committerJiri Denemark <jdenemar@redhat.com>
Mon, 9 Dec 2019 09:11:58 +0000 (10:11 +0100)
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
src/qemu/qemu_migration.h
src/qemu/qemu_migration_params.c

index d98fe9f80ad101225bef5adb5bb83edcf10432ee..b6f88d3fd9eaf454ba47259a97d110585a30266a 100644 (file)
@@ -83,6 +83,7 @@
     VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT,      VIR_TYPED_PARAM_INT, \
     VIR_MIGRATE_PARAM_BANDWIDTH_POSTCOPY, VIR_TYPED_PARAM_ULLONG, \
     VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS, VIR_TYPED_PARAM_INT, \
+    VIR_MIGRATE_PARAM_TLS_DESTINATION, VIR_TYPED_PARAM_STRING, \
     NULL
 
 
index 88c08528bc53082a6a904063440404db3a66e2de..e6cf6b4b0bd560f2a0340bcd51c2a40657fe2a95 100644 (file)
@@ -197,6 +197,10 @@ static const qemuMigrationParamsTPMapItem qemuMigrationParamsTPMap[] = {
     {.typedParam = VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS,
      .param = QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS,
      .party = QEMU_MIGRATION_SOURCE | QEMU_MIGRATION_DESTINATION},
+
+    {.typedParam = VIR_MIGRATE_PARAM_TLS_DESTINATION,
+     .param = QEMU_MIGRATION_PARAM_TLS_HOSTNAME,
+     .party = QEMU_MIGRATION_SOURCE},
 };
 
 static const qemuMigrationParamType qemuMigrationParamTypes[] = {
@@ -1007,7 +1011,10 @@ qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver,
 
     if (qemuMigrationParamsSetString(migParams,
                                      QEMU_MIGRATION_PARAM_TLS_CREDS,
-                                     *tlsAlias) < 0 ||
+                                     *tlsAlias) < 0)
+        goto error;
+
+    if (!migParams->params[QEMU_MIGRATION_PARAM_TLS_HOSTNAME].set &&
         qemuMigrationParamsSetString(migParams,
                                      QEMU_MIGRATION_PARAM_TLS_HOSTNAME,
                                      NULLSTR_EMPTY(hostname)) < 0)