]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: hotplug: Remove TLS alias generation from qemuDomainGetTLSObjects
authorPeter Krempa <pkrempa@redhat.com>
Wed, 30 May 2018 07:24:35 +0000 (09:24 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 5 Jun 2018 06:13:59 +0000 (08:13 +0200)
Callers should generate the alias separately.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_hotplug.c
src/qemu/qemu_hotplug.h
src/qemu/qemu_migration_params.c

index 9833f6dc6aa83a49f5520a4ca642046621e0babc..c769fb0b8cda941431077173b492308d0807d65e 100644 (file)
@@ -166,7 +166,7 @@ qemuDomainAddDiskSrcTLSObject(virQEMUDriverPtr driver,
                                 src->tlsCertdir,
                                 false,
                                 src->tlsVerify,
-                                NULL, &tlsProps, NULL, NULL) < 0)
+                                &tlsProps, NULL) < 0)
         goto cleanup;
 
     if (qemuDomainAddTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE,
@@ -1498,9 +1498,7 @@ qemuDomainGetTLSObjects(virQEMUCapsPtr qemuCaps,
                         const char *tlsCertdir,
                         bool tlsListen,
                         bool tlsVerify,
-                        const char *srcAlias,
                         virJSONValuePtr *tlsProps,
-                        char **tlsAlias,
                         virJSONValuePtr *secProps)
 {
     const char *secAlias = NULL;
@@ -1516,10 +1514,6 @@ qemuDomainGetTLSObjects(virQEMUCapsPtr qemuCaps,
                                      secAlias, qemuCaps, tlsProps) < 0)
         return -1;
 
-    if (tlsAlias &&
-        !(*tlsAlias = qemuAliasTLSObjFromSrcAlias(srcAlias)))
-        return -1;
-
     return 0;
 }
 
@@ -1559,12 +1553,14 @@ qemuDomainAddChardevTLSObjects(virQEMUDriverPtr driver,
     if (secinfo)
         *secAlias = secinfo->s.aes.alias;
 
+    if (!(*tlsAlias = qemuAliasTLSObjFromSrcAlias(charAlias)))
+        goto cleanup;
+
     if (qemuDomainGetTLSObjects(priv->qemuCaps, secinfo,
                                 cfg->chardevTLSx509certdir,
                                 dev->data.tcp.listen,
                                 cfg->chardevTLSx509verify,
-                                charAlias, &tlsProps, tlsAlias,
-                                &secProps) < 0)
+                                &tlsProps, &secProps) < 0)
         goto cleanup;
     dev->data.tcp.tlscreds = true;
 
index b0f741c37c8c5778d310e750aac2824e4b2ec345..9207bd0728b13b1c3626b90120ab909ebc096302 100644 (file)
@@ -53,9 +53,7 @@ int qemuDomainGetTLSObjects(virQEMUCapsPtr qemuCaps,
                             const char *tlsCertdir,
                             bool tlsListen,
                             bool tlsVerify,
-                            const char *srcAlias,
                             virJSONValuePtr *tlsProps,
-                            char **tlsAlias,
                             virJSONValuePtr *secProps);
 
 int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver,
index fede814c0091f9f70fb0edf036dc390665297b2f..80cec5ab6c9fdd6aa8c73e1d736373a9b1705d8c 100644 (file)
@@ -856,11 +856,13 @@ qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver,
         secAlias = priv->migSecinfo->s.aes.alias;
     }
 
+    if (!(*tlsAlias = qemuAliasTLSObjFromSrcAlias(QEMU_MIGRATION_TLS_ALIAS_BASE)))
+        goto error;
+
     if (qemuDomainGetTLSObjects(priv->qemuCaps, priv->migSecinfo,
                                 cfg->migrateTLSx509certdir, tlsListen,
                                 cfg->migrateTLSx509verify,
-                                QEMU_MIGRATION_TLS_ALIAS_BASE,
-                                &tlsProps, tlsAlias, &secProps) < 0)
+                                &tlsProps, &secProps) < 0)
         goto error;
 
     /* Ensure the domain doesn't already have the TLS objects defined...