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 03/13] migration: Create migrate_params_init() function
Date: Mon, 24 Apr 2023 20:32:26 +0200 [thread overview]
Message-ID: <20230424183236.74561-4-quintela@redhat.com> (raw)
In-Reply-To: <20230424183236.74561-1-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/migration.c | 29 +----------------------------
migration/options.c | 31 +++++++++++++++++++++++++++++++
migration/options.h | 1 +
3 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 22e8586623..45fc5be93a 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -3470,7 +3470,6 @@ static void migration_instance_finalize(Object *obj)
static void migration_instance_init(Object *obj)
{
MigrationState *ms = MIGRATION_OBJ(obj);
- MigrationParameters *params = &ms->parameters;
ms->state = MIGRATION_STATUS_NONE;
ms->mbps = -1;
@@ -3478,33 +3477,7 @@ static void migration_instance_init(Object *obj)
qemu_sem_init(&ms->pause_sem, 0);
qemu_mutex_init(&ms->error_mutex);
- params->tls_hostname = g_strdup("");
- params->tls_creds = g_strdup("");
-
- /* Set has_* up only for parameter checks */
- params->has_compress_level = true;
- params->has_compress_threads = true;
- params->has_compress_wait_thread = true;
- params->has_decompress_threads = true;
- params->has_throttle_trigger_threshold = true;
- params->has_cpu_throttle_initial = true;
- params->has_cpu_throttle_increment = true;
- params->has_cpu_throttle_tailslow = true;
- params->has_max_bandwidth = true;
- params->has_downtime_limit = true;
- params->has_x_checkpoint_delay = true;
- params->has_block_incremental = true;
- params->has_multifd_channels = true;
- params->has_multifd_compression = true;
- params->has_multifd_zlib_level = true;
- params->has_multifd_zstd_level = true;
- params->has_xbzrle_cache_size = true;
- params->has_max_postcopy_bandwidth = true;
- params->has_max_cpu_throttle = true;
- params->has_announce_initial = true;
- params->has_announce_max = true;
- params->has_announce_rounds = true;
- params->has_announce_step = true;
+ migrate_params_init(&ms->parameters);
qemu_sem_init(&ms->postcopy_pause_sem, 0);
qemu_sem_init(&ms->postcopy_pause_rp_sem, 0);
diff --git a/migration/options.c b/migration/options.c
index 4701c75a4d..201f9ff58f 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -738,6 +738,37 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp)
return params;
}
+void migrate_params_init(MigrationParameters *params)
+{
+ params->tls_hostname = g_strdup("");
+ params->tls_creds = g_strdup("");
+
+ /* Set has_* up only for parameter checks */
+ params->has_compress_level = true;
+ params->has_compress_threads = true;
+ params->has_compress_wait_thread = true;
+ params->has_decompress_threads = true;
+ params->has_throttle_trigger_threshold = true;
+ params->has_cpu_throttle_initial = true;
+ params->has_cpu_throttle_increment = true;
+ params->has_cpu_throttle_tailslow = true;
+ params->has_max_bandwidth = true;
+ params->has_downtime_limit = true;
+ params->has_x_checkpoint_delay = true;
+ params->has_block_incremental = true;
+ params->has_multifd_channels = true;
+ params->has_multifd_compression = true;
+ params->has_multifd_zlib_level = true;
+ params->has_multifd_zstd_level = true;
+ params->has_xbzrle_cache_size = true;
+ params->has_max_postcopy_bandwidth = true;
+ params->has_max_cpu_throttle = true;
+ params->has_announce_initial = true;
+ params->has_announce_max = true;
+ params->has_announce_rounds = true;
+ params->has_announce_step = true;
+}
+
/*
* Check whether the parameters are valid. Error will be put into errp
* (if provided). Return true if valid, otherwise false.
diff --git a/migration/options.h b/migration/options.h
index 89067e59a0..86bcbb738c 100644
--- a/migration/options.h
+++ b/migration/options.h
@@ -84,5 +84,6 @@ uint64_t migrate_xbzrle_cache_size(void);
/* parameters helpers */
bool migrate_params_check(MigrationParameters *params, Error **errp);
+void migrate_params_init(MigrationParameters *params);
#endif
--
2.39.2
next prev parent reply other threads:[~2023-04-24 18:39 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 ` Juan Quintela [this message]
2023-04-26 18:34 ` [PATCH v3 03/13] migration: Create migrate_params_init() function 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 ` [PATCH v3 09/13] migration: Create migrate_tls_creds() function Juan Quintela
2023-04-26 18:55 ` 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-4-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).