From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>,
Leonardo Bras <leobras@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>, Fam Zheng <fam@euphon.net>,
Juan Quintela <quintela@redhat.com>,
qemu-block@nongnu.org, Peter Xu <peterx@redhat.com>,
Eric Blake <eblake@redhat.com>, John Snow <jsnow@redhat.com>
Subject: [PATCH v3 09/13] migration: Create migrate_tls_creds() function
Date: Mon, 24 Apr 2023 20:32:32 +0200 [thread overview]
Message-ID: <20230424183236.74561-10-quintela@redhat.com> (raw)
In-Reply-To: <20230424183236.74561-1-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/options.c | 7 +++++++
migration/options.h | 1 +
migration/tls.c | 9 ++++-----
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/migration/options.c b/migration/options.c
index f65b7babef..9eabb4c25d 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -579,6 +579,13 @@ uint8_t migrate_throttle_trigger_threshold(void)
return s->parameters.throttle_trigger_threshold;
}
+char *migrate_tls_creds(void)
+{
+ MigrationState *s = migrate_get_current();
+
+ return s->parameters.tls_creds;
+}
+
uint64_t migrate_xbzrle_cache_size(void)
{
MigrationState *s = migrate_get_current();
diff --git a/migration/options.h b/migration/options.h
index 3948218dbe..47cc24585b 100644
--- a/migration/options.h
+++ b/migration/options.h
@@ -80,6 +80,7 @@ MultiFDCompression migrate_multifd_compression(void);
int migrate_multifd_zlib_level(void);
int migrate_multifd_zstd_level(void);
uint8_t migrate_throttle_trigger_threshold(void);
+char *migrate_tls_creds(void);
uint64_t migrate_xbzrle_cache_size(void);
/* parameters setters */
diff --git a/migration/tls.c b/migration/tls.c
index acd38e0b62..0d318516de 100644
--- a/migration/tls.c
+++ b/migration/tls.c
@@ -34,20 +34,19 @@ migration_tls_get_creds(MigrationState *s,
Error **errp)
{
Object *creds;
+ char *tls_creds = migrate_tls_creds();
QCryptoTLSCreds *ret;
- creds = object_resolve_path_component(
- object_get_objects_root(), s->parameters.tls_creds);
+ creds = object_resolve_path_component(object_get_objects_root(), tls_creds);
if (!creds) {
- error_setg(errp, "No TLS credentials with id '%s'",
- s->parameters.tls_creds);
+ error_setg(errp, "No TLS credentials with id '%s'", tls_creds);
return NULL;
}
ret = (QCryptoTLSCreds *)object_dynamic_cast(
creds, TYPE_QCRYPTO_TLS_CREDS);
if (!ret) {
error_setg(errp, "Object with id '%s' is not TLS credentials",
- s->parameters.tls_creds);
+ tls_creds);
return NULL;
}
if (!qcrypto_tls_creds_check_endpoint(ret, endpoint, errp)) {
--
2.39.2
next prev parent reply other threads:[~2023-04-24 18:37 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-24 18:32 [PATCH v3 00/13] Migration: Create options.c for capabilities/params/properties Juan Quintela
2023-04-24 18:32 ` [PATCH v3 01/13] migration: Move migrate_use_tls() to options.c Juan Quintela
2023-04-24 20:39 ` Vladimir Sementsov-Ogievskiy
2023-04-24 18:32 ` [PATCH v3 02/13] migration: Move qmp_migrate_set_parameters() " Juan Quintela
2023-04-24 20:45 ` Vladimir Sementsov-Ogievskiy
2023-04-24 18:32 ` [PATCH v3 03/13] migration: Create migrate_params_init() function Juan Quintela
2023-04-26 18:34 ` Vladimir Sementsov-Ogievskiy
2023-04-24 18:32 ` [PATCH v3 04/13] migration: Make all functions check have the same format Juan Quintela
2023-04-26 18:39 ` Vladimir Sementsov-Ogievskiy
2023-04-24 18:32 ` [PATCH v3 05/13] migration: Create migrate_downtime_limit() function Juan Quintela
2023-04-26 18:42 ` Vladimir Sementsov-Ogievskiy
2023-04-24 18:32 ` [PATCH v3 06/13] migration: Move migrate_set_block_incremental() to options.c Juan Quintela
2023-04-26 18:45 ` Vladimir Sementsov-Ogievskiy
2023-04-26 18:46 ` Vladimir Sementsov-Ogievskiy
2023-04-26 19:05 ` Juan Quintela
2023-04-24 18:32 ` [PATCH v3 07/13] migration: Move block_cleanup_parameters() " Juan Quintela
2023-04-26 18:48 ` Vladimir Sementsov-Ogievskiy
2023-04-24 18:32 ` [PATCH v3 08/13] migration: Remove MigrationState from block_cleanup_parameters() Juan Quintela
2023-04-26 18:51 ` Vladimir Sementsov-Ogievskiy
2023-04-26 19:08 ` Juan Quintela
2023-04-24 18:32 ` Juan Quintela [this message]
2023-04-26 18:55 ` [PATCH v3 09/13] migration: Create migrate_tls_creds() function Vladimir Sementsov-Ogievskiy
2023-04-26 19:40 ` Juan Quintela
2023-04-24 18:32 ` [PATCH v3 10/13] migration: Create migrate_tls_authz() function Juan Quintela
2023-04-26 18:56 ` Vladimir Sementsov-Ogievskiy
2023-04-24 18:32 ` [PATCH v3 11/13] migration: Create migrate_tls_hostname() function Juan Quintela
2023-04-26 18:59 ` Vladimir Sementsov-Ogievskiy
2023-04-24 18:32 ` [PATCH v3 12/13] migration: Create migrate_block_bitmap_mapping() function Juan Quintela
2023-04-26 19:03 ` Vladimir Sementsov-Ogievskiy
2023-04-24 18:32 ` [PATCH v3 13/13] migration: Move migration_properties to options.c Juan Quintela
2023-04-26 19:10 ` Vladimir Sementsov-Ogievskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230424183236.74561-10-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=eblake@redhat.com \
--cc=fam@euphon.net \
--cc=jsnow@redhat.com \
--cc=leobras@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=vsementsov@yandex-team.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).