Append 'x509' to the function identifiers managing the tls-creds-x509
objects. This defines the functions' scope and prevents naming
conflicts with the introduction of functions related to tls-creds-psk
in subsequent commits.
Suggested-by: Tejus GK <tejus.gk@nutanix.com>
Signed-off-by: Abhisek Panda <abhisek.panda1@nutanix.com>
---
src/qemu/qemu_hotplug.c | 40 ++++++++++++++++----------------
src/qemu/qemu_hotplug.h | 24 +++++++++----------
src/qemu/qemu_migration.c | 16 ++++++-------
src/qemu/qemu_migration_params.c | 32 ++++++++++++-------------
src/qemu/qemu_migration_params.h | 14 +++++------
5 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 5be567b510..a192ab1a0b 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1729,10 +1729,10 @@ qemuDomainDelTLSObjects(virDomainObj *vm,
int
-qemuDomainAddTLSObjects(virDomainObj *vm,
- virDomainAsyncJob asyncJob,
- virJSONValue **secProps,
- virJSONValue **tlsProps)
+qemuDomainAddTLSx509Objects(virDomainObj *vm,
+ virDomainAsyncJob asyncJob,
+ virJSONValue **secProps,
+ virJSONValue **tlsProps)
{
qemuDomainObjPrivate *priv = vm->privateData;
virErrorPtr orig_err;
@@ -1766,14 +1766,14 @@ qemuDomainAddTLSObjects(virDomainObj *vm,
int
-qemuDomainGetTLSObjects(qemuDomainSecretInfo *secinfo,
- const char *tlsCertdir,
- bool tlsListen,
- bool tlsVerify,
- const char *tlsPriority,
- const char *alias,
- virJSONValue **tlsProps,
- virJSONValue **secProps)
+qemuDomainGetTLSx509Objects(qemuDomainSecretInfo *secinfo,
+ const char *tlsCertdir,
+ bool tlsListen,
+ bool tlsVerify,
+ const char *tlsPriority,
+ const char *alias,
+ virJSONValue **tlsProps,
+ virJSONValue **secProps)
{
const char *secAlias = NULL;
@@ -1824,18 +1824,18 @@ qemuDomainAddChardevTLSObjects(virQEMUDriver *driver,
if (!(*tlsAlias = qemuAliasTLSObjFromSrcAlias(charAlias)))
return -1;
- if (qemuDomainGetTLSObjects(secinfo,
- cfg->chardevTLSx509certdir,
- dev->data.tcp.listen,
- cfg->chardevTLSx509verify,
- cfg->chardevTLSpriority,
- *tlsAlias, &tlsProps, &secProps) < 0)
+ if (qemuDomainGetTLSx509Objects(secinfo,
+ cfg->chardevTLSx509certdir,
+ dev->data.tcp.listen,
+ cfg->chardevTLSx509verify,
+ cfg->chardevTLSpriority,
+ *tlsAlias, &tlsProps, &secProps) < 0)
return -1;
dev->data.tcp.tlscreds = true;
- if (qemuDomainAddTLSObjects(vm, VIR_ASYNC_JOB_NONE,
- &secProps, &tlsProps) < 0)
+ if (qemuDomainAddTLSx509Objects(vm, VIR_ASYNC_JOB_NONE,
+ &secProps, &tlsProps) < 0)
return -1;
return 0;
diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h
index 60ed0e174c..0c969ab7f0 100644
--- a/src/qemu/qemu_hotplug.h
+++ b/src/qemu/qemu_hotplug.h
@@ -31,20 +31,20 @@ qemuDomainDelTLSObjects(virDomainObj *vm,
const char *tlsAlias);
int
-qemuDomainAddTLSObjects(virDomainObj *vm,
- virDomainAsyncJob asyncJob,
- virJSONValue **secProps,
- virJSONValue **tlsProps);
+qemuDomainAddTLSx509Objects(virDomainObj *vm,
+ virDomainAsyncJob asyncJob,
+ virJSONValue **secProps,
+ virJSONValue **tlsProps);
int
-qemuDomainGetTLSObjects(qemuDomainSecretInfo *secinfo,
- const char *tlsCertdir,
- bool tlsListen,
- bool tlsVerify,
- const char *tlsPriority,
- const char *alias,
- virJSONValue **tlsProps,
- virJSONValue **secProps);
+qemuDomainGetTLSx509Objects(qemuDomainSecretInfo *secinfo,
+ const char *tlsCertdir,
+ bool tlsListen,
+ bool tlsVerify,
+ const char *tlsPriority,
+ const char *alias,
+ virJSONValue **tlsProps,
+ virJSONValue **secProps);
int
qemuDomainAttachDiskGeneric(virDomainObj *vm,
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 3d6e472443..943478fe68 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -3511,10 +3511,10 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver,
/* Migrations using TLS need to add the "tls-creds-x509" object and
* set the migration TLS parameters */
if (flags & VIR_MIGRATE_TLS) {
- if (qemuMigrationParamsEnableTLS(driver, vm, true,
- VIR_ASYNC_JOB_MIGRATION_IN,
- &tlsAlias, NULL,
- migParams) < 0)
+ if (qemuMigrationParamsEnableTLSx509(driver, vm, true,
+ VIR_ASYNC_JOB_MIGRATION_IN,
+ &tlsAlias, NULL,
+ migParams) < 0)
goto error;
} else {
if (qemuMigrationParamsDisableTLS(vm, migParams) < 0)
@@ -5171,10 +5171,10 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
spec->destType == MIGRATION_DEST_FD)
hostname = spec->dest.host.name;
- if (qemuMigrationParamsEnableTLS(driver, vm, false,
- VIR_ASYNC_JOB_MIGRATION_OUT,
- &tlsAlias, hostname,
- migParams) < 0)
+ if (qemuMigrationParamsEnableTLSx509(driver, vm, false,
+ VIR_ASYNC_JOB_MIGRATION_OUT,
+ &tlsAlias, hostname,
+ migParams) < 0)
goto error;
} else {
if (qemuMigrationParamsDisableTLS(vm, migParams) < 0)
diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index dd47516742..d551ab9216 100644
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -1150,12 +1150,12 @@ qemuMigrationParamsSetString(qemuMigrationParams *migParams,
}
-/* qemuMigrationParamsEnableTLS
+/* qemuMigrationParamsEnableTLSx509
* @driver: pointer to qemu driver
* @vm: domain object
* @tlsListen: server or client
* @asyncJob: Migration job to join
- * @tlsAlias: alias to be generated for TLS object
+ * @tlsAlias: alias to be generated for TLS X.509 object
* @hostname: hostname of the migration destination
* @migParams: migration parameters to set
*
@@ -1166,17 +1166,17 @@ qemuMigrationParamsSetString(qemuMigrationParams *migParams,
* Returns 0 on success, -1 on failure
*/
int
-qemuMigrationParamsEnableTLS(virQEMUDriver *driver,
- virDomainObj *vm,
- bool tlsListen,
- int asyncJob,
- char **tlsAlias,
- const char *hostname,
- qemuMigrationParams *migParams)
+qemuMigrationParamsEnableTLSx509(virQEMUDriver *driver,
+ virDomainObj *vm,
+ bool tlsListen,
+ int asyncJob,
+ char **tlsAlias,
+ const char *hostname,
+ qemuMigrationParams *migParams)
{
qemuDomainObjPrivate *priv = vm->privateData;
qemuDomainJobPrivate *jobPriv = vm->job->privateData;
- g_autoptr(virJSONValue) tlsProps = NULL;
+ g_autoptr(virJSONValue) tlsx509Props = NULL;
g_autoptr(virJSONValue) secProps = NULL;
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
const char *secAlias = NULL;
@@ -1205,11 +1205,11 @@ qemuMigrationParamsEnableTLS(virQEMUDriver *driver,
if (!(*tlsAlias = qemuAliasTLSObjFromSrcAlias(QEMU_MIGRATION_TLS_ALIAS_BASE)))
return -1;
- if (qemuDomainGetTLSObjects(priv->migSecinfo,
- cfg->migrateTLSx509certdir, tlsListen,
- cfg->migrateTLSx509verify,
- cfg->migrateTLSpriority,
- *tlsAlias, &tlsProps, &secProps) < 0)
+ if (qemuDomainGetTLSx509Objects(priv->migSecinfo,
+ cfg->migrateTLSx509certdir, tlsListen,
+ cfg->migrateTLSx509verify,
+ cfg->migrateTLSpriority,
+ *tlsAlias, &tlsx509Props, &secProps) < 0)
return -1;
/* Ensure the domain doesn't already have the TLS objects defined...
@@ -1218,7 +1218,7 @@ qemuMigrationParamsEnableTLS(virQEMUDriver *driver,
* some other error path between now and perform . */
qemuDomainDelTLSObjects(vm, asyncJob, secAlias, *tlsAlias);
- if (qemuDomainAddTLSObjects(vm, asyncJob, &secProps, &tlsProps) < 0)
+ if (qemuDomainAddTLSx509Objects(vm, asyncJob, &secProps, &tlsx509Props) < 0)
return -1;
if (qemuMigrationParamsSetString(migParams,
diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h
index b7a829b85a..14e20fb71e 100644
--- a/src/qemu/qemu_migration_params.h
+++ b/src/qemu/qemu_migration_params.h
@@ -115,13 +115,13 @@ qemuMigrationParamsApply(virDomainObj *vm,
unsigned int apiFlags);
int
-qemuMigrationParamsEnableTLS(virQEMUDriver *driver,
- virDomainObj *vm,
- bool tlsListen,
- int asyncJob,
- char **tlsAlias,
- const char *hostname,
- qemuMigrationParams *migParams);
+qemuMigrationParamsEnableTLSx509(virQEMUDriver *driver,
+ virDomainObj *vm,
+ bool tlsListen,
+ int asyncJob,
+ char **tlsAlias,
+ const char *hostname,
+ qemuMigrationParams *migParams);
int
qemuMigrationParamsDisableTLS(virDomainObj *vm,
--
2.43.7On Wed, Jul 29, 2026 at 08:58:56 +0000, Abhisek Panda wrote: > Append 'x509' to the function identifiers managing the tls-creds-x509 > objects. This defines the functions' scope and prevents naming > conflicts with the introduction of functions related to tls-creds-psk > in subsequent commits. > > Suggested-by: Tejus GK <tejus.gk@nutanix.com> > Signed-off-by: Abhisek Panda <abhisek.panda1@nutanix.com> > --- > src/qemu/qemu_hotplug.c | 40 ++++++++++++++++---------------- > src/qemu/qemu_hotplug.h | 24 +++++++++---------- > src/qemu/qemu_migration.c | 16 ++++++------- > src/qemu/qemu_migration_params.c | 32 ++++++++++++------------- > src/qemu/qemu_migration_params.h | 14 +++++------ > 5 files changed, 63 insertions(+), 63 deletions(-) Reviewed-by: Peter Krempa <pkrempa@redhat.com>
© 2016 - 2026 Red Hat, Inc.