[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 08/13] migration: Export tls-[creds|hostname|authz] params to
From: |
Peter Xu |
Subject: |
[PATCH v6 08/13] migration: Export tls-[creds|hostname|authz] params to cmdline too |
Date: |
Tue, 17 May 2022 15:57:25 -0400 |
It's useful for specifying tls credentials all in the cmdline (along with
the -object tls-creds-*), especially for debugging purpose.
The trick here is we must remember to not free these fields again in the
finalize() function of migration object, otherwise it'll cause double-free.
The thing is when destroying an object, we'll first destroy the properties
that bound to the object, then the object itself. To be explicit, when
destroy the object in object_finalize() we have such sequence of
operations:
object_property_del_all(obj);
object_deinit(obj, ti);
So after this change the two fields are properly released already even
before reaching the finalize() function but in object_property_del_all(),
hence we don't need to free them anymore in finalize() or it's double-free.
This also fixes a trivial memory leak for tls-authz as we forgot to free it
before this patch.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/migration.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index d17f435d08..aa4185148c 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -4379,6 +4379,9 @@ static Property migration_properties[] = {
DEFAULT_MIGRATE_ANNOUNCE_STEP),
DEFINE_PROP_BOOL("x-postcopy-preempt-break-huge", MigrationState,
postcopy_preempt_break_huge, true),
+ DEFINE_PROP_STRING("tls-creds", MigrationState, parameters.tls_creds),
+ DEFINE_PROP_STRING("tls-hostname", MigrationState,
parameters.tls_hostname),
+ DEFINE_PROP_STRING("tls-authz", MigrationState, parameters.tls_authz),
/* Migration capabilities */
DEFINE_PROP_MIG_CAP("x-xbzrle", MIGRATION_CAPABILITY_XBZRLE),
@@ -4412,12 +4415,9 @@ static void migration_class_init(ObjectClass *klass,
void *data)
static void migration_instance_finalize(Object *obj)
{
MigrationState *ms = MIGRATION_OBJ(obj);
- MigrationParameters *params = &ms->parameters;
qemu_mutex_destroy(&ms->error_mutex);
qemu_mutex_destroy(&ms->qemu_file_lock);
- g_free(params->tls_hostname);
- g_free(params->tls_creds);
qemu_sem_destroy(&ms->wait_unplug_sem);
qemu_sem_destroy(&ms->rate_limit_sem);
qemu_sem_destroy(&ms->pause_sem);
--
2.32.0
- [PATCH v6 00/13] migration: Postcopy Preemption, Peter Xu, 2022/05/17
- [PATCH v6 01/13] migration: Add postcopy-preempt capability, Peter Xu, 2022/05/17
- [PATCH v6 02/13] migration: Postcopy preemption preparation on channel creation, Peter Xu, 2022/05/17
- [PATCH v6 03/13] migration: Postcopy preemption enablement, Peter Xu, 2022/05/17
- [PATCH v6 07/13] migration: Add helpers to detect TLS capability, Peter Xu, 2022/05/17
- [PATCH v6 05/13] migration: Create the postcopy preempt channel asynchronously, Peter Xu, 2022/05/17
- [PATCH v6 09/13] migration: Enable TLS for preempt channel, Peter Xu, 2022/05/17
- [PATCH v6 08/13] migration: Export tls-[creds|hostname|authz] params to cmdline too,
Peter Xu <=
- [PATCH v6 11/13] tests: Add postcopy tls migration test, Peter Xu, 2022/05/17
- [PATCH v6 12/13] tests: Add postcopy tls recovery migration test, Peter Xu, 2022/05/17
- [PATCH v6 13/13] tests: Add postcopy preempt tests, Peter Xu, 2022/05/17
- [PATCH v6 06/13] migration: Add property x-postcopy-preempt-break-huge, Peter Xu, 2022/05/17