[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 17/21] migration: Export tls-[creds|hostname|authz] params to
From: |
Peter Xu |
Subject: |
[PATCH v5 17/21] migration: Export tls-[creds|hostname|authz] params to cmdline too |
Date: |
Mon, 25 Apr 2022 19:38:43 -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 71a50b5c37..b0f2de1e09 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -4339,6 +4339,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),
@@ -4372,12 +4375,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 v5 04/21] tests: add migration tests of TLS with x509 credentials, (continued)
- [PATCH v5 04/21] tests: add migration tests of TLS with x509 credentials, Peter Xu, 2022/04/25
- [PATCH v5 06/21] tests: convert multifd migration tests to use common helper, Peter Xu, 2022/04/25
- [PATCH v5 08/21] tests: add multifd migration tests of TLS with x509 credentials, Peter Xu, 2022/04/25
- [PATCH v5 09/21] tests: ensure migration status isn't reported as failed, Peter Xu, 2022/04/25
- [PATCH v5 10/21] migration: Add postcopy-preempt capability, Peter Xu, 2022/04/25
- [PATCH v5 11/21] migration: Postcopy preemption preparation on channel creation, Peter Xu, 2022/04/25
- [PATCH v5 12/21] migration: Postcopy preemption enablement, Peter Xu, 2022/04/25
- [PATCH v5 14/21] migration: Create the postcopy preempt channel asynchronously, Peter Xu, 2022/04/25
- [PATCH v5 13/21] migration: Postcopy recover with preempt enabled, Peter Xu, 2022/04/25
- [PATCH v5 15/21] migration: Parameter x-postcopy-preempt-break-huge, Peter Xu, 2022/04/25
- [PATCH v5 17/21] migration: Export tls-[creds|hostname|authz] params to cmdline too,
Peter Xu <=
- [PATCH v5 18/21] migration: Enable TLS for preempt channel, Peter Xu, 2022/04/25
- [PATCH v5 16/21] migration: Add helpers to detect TLS capability, Peter Xu, 2022/04/25
- [PATCH v5 19/21] tests: Add postcopy tls migration test, Peter Xu, 2022/04/25
- [PATCH v5 21/21] tests: Add postcopy preempt tests, Peter Xu, 2022/04/25
- [PATCH v5 20/21] tests: Add postcopy tls recovery migration test, Peter Xu, 2022/04/25