From: Fabiano Rosas <farosas@suse.de>
To: qemu-devel@nongnu.org
Cc: Peter Xu <peterx@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
"Dr . David Alan Gilbert" <dave@treblig.org>
Subject: [PATCH v2 14/18] migration: Use output visitor in info command
Date: Wed, 9 Sep 2026 18:45:04 -0300 [thread overview]
Message-ID: <20260909214509.237309-15-farosas@suse.de> (raw)
In-Reply-To: <20260909214509.237309-1-farosas@suse.de>
The hmp_info_migrate_parameters function currently open-codes the
mon_printf calls for each migration parameter. As with the set command
in the last patch, this should not be necessary as the QAPI
infrastructure already has generated code that takes type and struct
member names into account, including converting _ from C into the '-'
character as part of parameter names strings.
The current code is also quite painful to rebase if a series has been
carried for a long time while parameters have been added in master.
Replace all of this with a conversion from MigrationParameters to
QDict using an output visitor and a loop over the QDict that prints
per-QAPI-type formatted strings.
Modelled after block/qapi.c:dump_qobject, but with some changes to
keep the migration command output formatting.
Note that this was not a for-free improvement, the HMP command format
output was changed incompatibly in a previous patch. It doesn't output
units anymore.
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
migration/migration-hmp-cmds.c | 238 ++++++++++++---------------------
migration/options.c | 2 +-
migration/options.h | 1 +
3 files changed, 86 insertions(+), 155 deletions(-)
diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
index 0d93d38b05..5dfbb69390 100644
--- a/migration/migration-hmp-cmds.c
+++ b/migration/migration-hmp-cmds.c
@@ -26,7 +26,12 @@
#include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-visit-migration.h"
#include "qapi/qobject-input-visitor.h"
+#include "qapi/qobject-output-visitor.h"
+#include "qobject/qbool.h"
#include "qobject/qdict.h"
+#include "qobject/qjson.h"
+#include "qobject/qlist.h"
+#include "qobject/qnum.h"
#include "qobject/qstring.h"
#include "qapi/string-input-visitor.h"
#include "qapi/string-output-visitor.h"
@@ -317,170 +322,95 @@ void hmp_info_migrate_capabilities(MonitorHMP *hmp, const QDict *qdict)
qapi_free_MigrationCapabilityStatusList(caps);
}
-static void monitor_print_cpr_exec_command(MonitorHMP *hmp, strList *args)
+static void hmp_migrate_print_qobject(MonitorHMP *hmp, const char *label,
+ QObject *obj)
{
- monitor_hmp_printf(hmp, "%s:",
- MigrationParameter_str(MIGRATION_PARAMETER_CPR_EXEC_COMMAND));
+ const char *sep;
- while (args) {
- monitor_hmp_printf(hmp, " %s", args->value);
- args = args->next;
+ if (!obj) {
+ return;
+ }
+
+ /*
+ * Put a space after labels
+ * foo: bar
+ * ^
+ */
+ if (label && label[0] && label[strlen(label) - 1] == ':') {
+ sep = " ";
+ } else {
+ sep = "";
+ }
+
+ switch (qobject_type(obj)) {
+ case QTYPE_QNUM: {
+ g_autofree char *str = qnum_to_string(qobject_to(QNum, obj));
+
+ monitor_hmp_printf(hmp, "%s%s%s", label, sep, str);
+ break;
+ }
+ case QTYPE_QSTRING:
+ monitor_hmp_printf(hmp, "%s%s%s", label, sep,
+ qstring_get_str(qobject_to(QString, obj)));
+ break;
+ case QTYPE_QDICT: {
+ QDict *d = qobject_to(QDict, obj);
+ const QDictEntry *e;
+ int i = 0;
+
+ for (e = qdict_first(d); e; e = qdict_next(d, e), i++) {
+ g_autofree char *l = g_strdup_printf("%s:", qdict_entry_key(e));
+ if (i) {
+ monitor_hmp_printf(hmp, " ");
+ }
+ hmp_migrate_print_qobject(hmp, l, qdict_entry_value(e));
+ }
+ break;
+ }
+ case QTYPE_QLIST: {
+ const QListEntry *e;
+
+ monitor_hmp_printf(hmp, "%s", label);
+
+ for (e = qlist_first(qobject_to(QList, obj)); e; e = qlist_next(e)) {
+ /*
+ * In the first iteration, this is the space after the
+ * colon, otherwise it's the space between list
+ * elements.
+ */
+ monitor_hmp_printf(hmp, " ");
+ hmp_migrate_print_qobject(hmp, "", e->value);
+ }
+
+ break;
+ }
+ case QTYPE_QBOOL:
+ monitor_hmp_printf(hmp, "%s%s%s", label, sep,
+ qbool_get_bool(qobject_to(QBool, obj)) ?
+ "on" : "off");
+ break;
+ case QTYPE_NONE:
+ case QTYPE_QNULL:
+ default:
+ g_assert_not_reached();
+ break;
}
- monitor_hmp_printf(hmp, "\n");
}
void hmp_info_migrate_parameters(MonitorHMP *hmp, const QDict *qdict)
{
- MigrationParameters *params;
- MigrationState *s = migrate_get_current();
+ MigrationParameters *params = qmp_query_migrate_parameters(NULL);
+ g_autoptr(QDict) d;
+ const QDictEntry *e;
- params = qmp_query_migrate_parameters(NULL);
+ assert(params);
- if (params) {
- monitor_hmp_printf(hmp, "%s: %" PRIu64 "\n",
- MigrationParameter_str(MIGRATION_PARAMETER_ANNOUNCE_INITIAL),
- params->announce_initial);
- monitor_hmp_printf(hmp, "%s: %" PRIu64 "\n",
- MigrationParameter_str(MIGRATION_PARAMETER_ANNOUNCE_MAX),
- params->announce_max);
- monitor_hmp_printf(hmp, "%s: %" PRIu64 "\n",
- MigrationParameter_str(MIGRATION_PARAMETER_ANNOUNCE_ROUNDS),
- params->announce_rounds);
- monitor_hmp_printf(hmp, "%s: %" PRIu64 "\n",
- MigrationParameter_str(MIGRATION_PARAMETER_ANNOUNCE_STEP),
- params->announce_step);
- assert(params->has_throttle_trigger_threshold);
- monitor_hmp_printf(hmp, "%s: %u\n",
- MigrationParameter_str(MIGRATION_PARAMETER_THROTTLE_TRIGGER_THRESHOLD),
- params->throttle_trigger_threshold);
- assert(params->has_cpu_throttle_initial);
- monitor_hmp_printf(hmp, "%s: %u\n",
- MigrationParameter_str(MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL),
- params->cpu_throttle_initial);
- assert(params->has_cpu_throttle_increment);
- monitor_hmp_printf(hmp, "%s: %u\n",
- MigrationParameter_str(MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT),
- params->cpu_throttle_increment);
- assert(params->has_cpu_throttle_tailslow);
- monitor_hmp_printf(hmp, "%s: %s\n",
- MigrationParameter_str(MIGRATION_PARAMETER_CPU_THROTTLE_TAILSLOW),
- params->cpu_throttle_tailslow ? "on" : "off");
- assert(params->has_max_cpu_throttle);
- monitor_hmp_printf(hmp, "%s: %u\n",
- MigrationParameter_str(MIGRATION_PARAMETER_MAX_CPU_THROTTLE),
- params->max_cpu_throttle);
- assert(params->tls_creds);
- monitor_hmp_printf(hmp, "%s: %s\n",
- MigrationParameter_str(MIGRATION_PARAMETER_TLS_CREDS),
- params->tls_creds->u.s);
- assert(params->tls_hostname);
- monitor_hmp_printf(hmp, "%s: %s\n",
- MigrationParameter_str(MIGRATION_PARAMETER_TLS_HOSTNAME),
- params->tls_hostname->u.s);
- assert(params->tls_authz);
- monitor_hmp_printf(hmp, "%s: %s\n",
- MigrationParameter_str(MIGRATION_PARAMETER_TLS_AUTHZ),
- params->tls_authz->u.s);
- assert(params->has_max_bandwidth);
- monitor_hmp_printf(hmp, "%s: %" PRIu64 "\n",
- MigrationParameter_str(MIGRATION_PARAMETER_MAX_BANDWIDTH),
- params->max_bandwidth);
- assert(params->has_avail_switchover_bandwidth);
- monitor_hmp_printf(hmp, "%s: %" PRIu64 "\n",
- MigrationParameter_str(MIGRATION_PARAMETER_AVAIL_SWITCHOVER_BANDWIDTH),
- params->avail_switchover_bandwidth);
- assert(params->has_max_postcopy_bandwidth);
- monitor_hmp_printf(hmp, "%s: %" PRIu64 "\n",
- MigrationParameter_str(MIGRATION_PARAMETER_MAX_POSTCOPY_BANDWIDTH),
- params->max_postcopy_bandwidth);
- assert(params->has_downtime_limit);
- monitor_hmp_printf(hmp, "%s: %" PRIu64 "\n",
- MigrationParameter_str(MIGRATION_PARAMETER_DOWNTIME_LIMIT),
- params->downtime_limit);
- assert(params->has_x_checkpoint_delay);
- monitor_hmp_printf(hmp, "%s: %u\n",
- MigrationParameter_str(MIGRATION_PARAMETER_X_CHECKPOINT_DELAY),
- params->x_checkpoint_delay);
- monitor_hmp_printf(hmp, "%s: %u\n",
- MigrationParameter_str(MIGRATION_PARAMETER_MULTIFD_CHANNELS),
- params->multifd_channels);
- monitor_hmp_printf(hmp, "%s: %s\n",
- MigrationParameter_str(MIGRATION_PARAMETER_MULTIFD_COMPRESSION),
- MultiFDCompression_str(params->multifd_compression));
- assert(params->has_zero_page_detection);
- monitor_hmp_printf(hmp, "%s: %s\n",
- MigrationParameter_str(MIGRATION_PARAMETER_ZERO_PAGE_DETECTION),
- qapi_enum_lookup(&ZeroPageDetection_lookup,
- params->zero_page_detection));
- monitor_hmp_printf(hmp, "%s: %" PRIu64 "\n",
- MigrationParameter_str(MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE),
- params->xbzrle_cache_size);
+ d = migrate_params_to_dict(params, NULL);
+ for (e = qdict_first(d); e; e = qdict_next(d, e)) {
+ g_autofree char *label = g_strdup_printf("%s:", qdict_entry_key(e));
- if (s->has_block_bitmap_mapping) {
- BitmapMigrationNodeAliasList *nal;
- BitmapMigrationNodeAlias *na;
- BitmapMigrationBitmapAliasList *bal;
- BitmapMigrationBitmapAlias *ba;
- BitmapMigrationBitmapAliasTransform *bat;
-
- monitor_hmp_printf(hmp, "%s:",
- MigrationParameter_str(
- MIGRATION_PARAMETER_BLOCK_BITMAP_MAPPING));
-
- for (nal = params->block_bitmap_mapping; nal; nal = nal->next)
- {
- na = nal->value;
- monitor_hmp_printf(hmp, " bitmaps:");
- for (bal = na->bitmaps; bal; bal = bal->next) {
- ba = bal->value;
- bat = ba->transform;
-
- monitor_hmp_printf(hmp, " name: %s", ba->name);
- if (bat && bat->has_persistent) {
- if (bat->persistent) {
- monitor_hmp_printf(hmp, " persistent: on");
- } else {
- monitor_hmp_printf(hmp, " persistent: off");
- }
- }
- monitor_hmp_printf(hmp, " alias: %s", ba->alias);
- }
- monitor_hmp_printf(hmp, " node-name: %s alias: %s",
- na->node_name, na->alias);
- }
-
- monitor_hmp_printf(hmp, "\n");
- }
-
- monitor_hmp_printf(hmp, "%s: %" PRIu64 "\n",
- MigrationParameter_str(MIGRATION_PARAMETER_X_VCPU_DIRTY_LIMIT_PERIOD),
- params->x_vcpu_dirty_limit_period);
-
- monitor_hmp_printf(hmp, "%s: %" PRIu64 "\n",
- MigrationParameter_str(MIGRATION_PARAMETER_VCPU_DIRTY_LIMIT),
- params->vcpu_dirty_limit);
-
- assert(params->has_mode);
- monitor_hmp_printf(hmp, "%s: %s\n",
- MigrationParameter_str(MIGRATION_PARAMETER_MODE),
- qapi_enum_lookup(&MigMode_lookup, params->mode));
-
- if (params->has_direct_io) {
- monitor_hmp_printf(hmp, "%s: %s\n",
- MigrationParameter_str(
- MIGRATION_PARAMETER_DIRECT_IO),
- params->direct_io ? "on" : "off");
- }
-
- if (params->has_x_rdma_chunk_size) {
- monitor_hmp_printf(hmp, "%s: %" PRIu64 "\n",
- MigrationParameter_str(
- MIGRATION_PARAMETER_X_RDMA_CHUNK_SIZE),
- params->x_rdma_chunk_size);
- }
-
- assert(params->has_cpr_exec_command);
- monitor_print_cpr_exec_command(hmp, params->cpr_exec_command);
+ hmp_migrate_print_qobject(hmp, label, qdict_entry_value(e));
+ monitor_hmp_printf(hmp, "\n");
}
qapi_free_MigrationParameters(params);
diff --git a/migration/options.c b/migration/options.c
index 990fcd6867..188c4ad20b 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -1089,7 +1089,7 @@ static void tls_opt_to_str(StrOrNull *opt)
opt->u.s = g_strdup("");
}
-static QDict *migrate_params_to_dict(MigrationParameters *p, Error **errp)
+QDict *migrate_params_to_dict(MigrationParameters *p, Error **errp)
{
QObject *obj = NULL;
Visitor *v = qobject_output_visitor_new(&obj);
diff --git a/migration/options.h b/migration/options.h
index c7da2d0b5b..0d9f88c11e 100644
--- a/migration/options.h
+++ b/migration/options.h
@@ -94,4 +94,5 @@ uint64_t migrate_rdma_chunk_size(void);
bool migrate_params_check(MigrationParameters *params, Error **errp);
void migrate_params_init(MigrationParameters *params);
bool migrate_params_free(MigrationParameters *params, Error **errp);
+QDict *migrate_params_to_dict(MigrationParameters *p, Error **errp);
#endif
--
2.53.0
next prev parent reply other threads:[~2026-09-09 21:47 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-09 21:44 [PATCH v2 00/18] migration: MigrationParameters changes Fabiano Rosas
2026-09-09 21:44 ` [PATCH v2 01/18] checkpatch: Fix checking of newlines in error messages Fabiano Rosas
2026-09-09 21:44 ` [PATCH v2 02/18] migration/options.c: Don't export migrate_tls_opts_free Fabiano Rosas
2026-09-09 21:44 ` [PATCH v2 03/18] migration: Rename variables in qmp_migrate_set_parameters Fabiano Rosas
2026-09-09 21:44 ` [PATCH v2 04/18] migration: Use QAPI_CLONE_MEMBERS in migrate_params_apply Fabiano Rosas
2026-09-09 21:44 ` [PATCH v2 05/18] migration: Merge parameter structs instead of assigning one by one Fabiano Rosas
2026-09-10 12:28 ` Peter Xu
2026-09-09 21:44 ` [PATCH v2 06/18] migration: Open code migrate_params_apply Fabiano Rosas
2026-09-09 21:44 ` [PATCH v2 07/18] migration: Stop freeing s->parameters members individually Fabiano Rosas
2026-09-09 21:44 ` [PATCH v2 08/18] migration: Use migrate_params_free during finalize Fabiano Rosas
2026-09-09 21:44 ` [PATCH v2 09/18] tests/qtest/migration: Add a test for HMP Fabiano Rosas
2026-09-10 14:02 ` Peter Xu
2026-09-13 20:30 ` Dr. David Alan Gilbert
2026-09-09 21:45 ` [PATCH v2 10/18] tests/qtest/migration: Add a test for HMP completion Fabiano Rosas
2026-09-10 17:36 ` Peter Xu
2026-09-13 20:58 ` Dr. David Alan Gilbert
2026-09-09 21:45 ` [PATCH v2 11/18] migration: HMP: Fix bandwidth parameters Fabiano Rosas
2026-09-10 6:05 ` Markus Armbruster
2026-09-10 12:37 ` Fabiano Rosas
2026-09-11 6:19 ` Markus Armbruster
2026-09-10 13:20 ` Dr. David Alan Gilbert
2026-09-10 13:26 ` Dr. David Alan Gilbert
2026-09-10 17:38 ` Peter Xu
2026-09-09 21:45 ` [PATCH v2 12/18] migration: Change HMP 'info migrate_parameters' output Fabiano Rosas
2026-09-10 7:32 ` Markus Armbruster
2026-09-10 13:02 ` Fabiano Rosas
2026-09-11 6:46 ` Markus Armbruster
2026-09-09 21:45 ` [PATCH v2 13/18] migration: Use keyval input visitor in HMP set command Fabiano Rosas
2026-09-10 11:07 ` Markus Armbruster
2026-09-10 14:15 ` Fabiano Rosas
2026-09-10 22:10 ` Fabiano Rosas
2026-09-11 8:22 ` Markus Armbruster
2026-09-11 12:54 ` Fabiano Rosas
2026-09-11 8:12 ` Markus Armbruster
2026-09-09 21:45 ` Fabiano Rosas [this message]
2026-09-09 21:45 ` [PATCH v2 15/18] migration: Rewrite migrate_set_parameter_completion using QDict Fabiano Rosas
2026-09-10 11:17 ` Markus Armbruster
2026-09-10 13:09 ` Fabiano Rosas
2026-09-11 7:15 ` Markus Armbruster
2026-09-09 21:45 ` [PATCH v2 16/18] migration: Add capabilities into MigrationParameters Fabiano Rosas
2026-09-10 11:22 ` Markus Armbruster
2026-09-09 21:45 ` [PATCH v2 17/18] migration: Remove s->capabilities Fabiano Rosas
2026-09-09 21:45 ` [PATCH v2 18/18] qapi/migration: Deprecate capabilities commands Fabiano Rosas
2026-09-10 17:35 ` [PATCH v2 00/18] migration: MigrationParameters changes Peter Xu
2026-09-10 19:27 ` Fabiano Rosas
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=20260909214509.237309-15-farosas@suse.de \
--to=farosas@suse.de \
--cc=armbru@redhat.com \
--cc=dave@treblig.org \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.