From nobody Sat Nov 15 14:53:46 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1751313704; cv=none; d=zohomail.com; s=zohoarc; b=j32veA9FWp4OpT02/IewE/h6XMrbOPs66/ijBZVzh32ZKB+Z55+1ELX4hkhwfSFgTWkFSzrsHnFlsM10b1JrsMENn/KjEmAwHJpC+E/LQeRv5VPHH0nNOdy2H7NDoialmeNIYy/YZOFEgcRiWT3U6dhtv/ZDUnu+NHwdLcAju9o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751313704; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Wj0Ik7pwtTAWFyDHT1xPBMQhokUz1vq0SCVg2ale9JA=; b=DZIz/uvhGwuDTM756rgE7bpLbJv9SEJxJRCnUBES3/QHrZYuLrTsTLmRBooustwuUc3ma1lLFvyNjr3iV5etWOEvJsqLuzVmb40s/lbagtdN9N+KKe7Pz5SaBH9UBbCz0ir0u0xYWa3+Ff8+AXFzLNMquC/Lze6yuOXj5FPW5DM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751313704009424.29369395377023; Mon, 30 Jun 2025 13:01:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uWKfl-0003ay-Uz; Mon, 30 Jun 2025 16:00:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uWKfj-0003Ql-4x for qemu-devel@nongnu.org; Mon, 30 Jun 2025 16:00:11 -0400 Received: from smtp-out1.suse.de ([195.135.223.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uWKfg-0007hj-I2 for qemu-devel@nongnu.org; Mon, 30 Jun 2025 16:00:10 -0400 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 120CF21163; Mon, 30 Jun 2025 19:59:50 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 80A591399F; Mon, 30 Jun 2025 19:59:48 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id mPKlELTsYmhQUAAAD6G6ig (envelope-from ); Mon, 30 Jun 2025 19:59:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1751313592; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Wj0Ik7pwtTAWFyDHT1xPBMQhokUz1vq0SCVg2ale9JA=; b=KWkRZ2AZkN7LZ//w7tjlYutlnEqiD4rZC2oB59RMDjl3d3GxYNWEIWYRvH5FBpElziKNe1 O6BfBDa+KTnnd2SVzI+JUaHosSk3nVjmaK01emWVAeiE5WKXXMuNsKaTG5hEjmfqspUwCU xmWyMDB/Yg4yBwMU86uvBX9lwhxdjNc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1751313592; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Wj0Ik7pwtTAWFyDHT1xPBMQhokUz1vq0SCVg2ale9JA=; b=zTe6RkOMWJZHdej+58iBkQGkW3o9+o0lpGmQIoHtQyz+pr6alFHR/onEGCKGznRgAu6Vx3 k95/k+4d1i2CdLDQ== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="asUs7H4/"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=tIb+2TR0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1751313590; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Wj0Ik7pwtTAWFyDHT1xPBMQhokUz1vq0SCVg2ale9JA=; b=asUs7H4/9oIppuXL9JKplcQXwtnL1EY8kXGFrp4x87tCr2bamWHjkvcDyQEHc/In9uGNz1 dPDmnoCvgs+lme+UWWciRH3zh/fmN15TCfXYw5W+dNkSq/OvvK3NO36nFU1Xt4EG8J8Pbf J6NFunBV9YjJ6uq/DlvwHHwFxCVAx1g= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1751313590; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Wj0Ik7pwtTAWFyDHT1xPBMQhokUz1vq0SCVg2ale9JA=; b=tIb+2TR0FVd+P+BMYRalHRyviVLDW0T/zHmgCE3nUcU0slqlexKNFrjJsUqLYq7l4LbiZ4 FdpDvd4Jhs1p0UAw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: berrange@redhat.com, armbru@redhat.com, Peter Xu Subject: [PATCH v2 15/24] migration: Cleanup hmp_info_migrate_parameters Date: Mon, 30 Jun 2025 16:59:04 -0300 Message-Id: <20250630195913.28033-16-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20250630195913.28033-1-farosas@suse.de> References: <20250630195913.28033-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Queue-Id: 120CF21163 X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from,2a07:de40:b281:106:10:150:64:167:received]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCPT_COUNT_THREE(0.00)[4]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid, suse.de:dkim, suse.de:email, imap1.dmz-prg2.suse.org:rdns, imap1.dmz-prg2.suse.org:helo] X-Spam-Score: -3.01 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=195.135.223.130; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.237, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) (identity @suse.de) X-ZM-MESSAGEID: 1751313705524116600 Content-Type: text/plain; charset="utf-8" Do a cleanup of hmp_info_migrate_parameters() before adding more lines into it: - Make sure every parameter asserts that the has_* field is set. qmp_query_migrate_parameters should have set them all. (except for block-bitmap-mapping) - Remove the if (params), qmp_query_migrate_parameters never returns NULL. - Add a macro to encapsulate boilerplate. - Line breaks for legibility. Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- migration/migration-hmp-cmds.c | 277 ++++++++++++++++++--------------- 1 file changed, 155 insertions(+), 122 deletions(-) diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c index f29bdc12a8..b5618981b3 100644 --- a/migration/migration-hmp-cmds.c +++ b/migration/migration-hmp-cmds.c @@ -33,6 +33,11 @@ #include "options.h" #include "migration.h" =20 +#define PARAM_INFO(_a, _f, _e, _v) do { \ + assert(_a); \ + monitor_printf(mon, _f, MigrationParameter_str(_e), _v); \ + } while (0) + static void migration_global_dump(Monitor *mon) { MigrationState *ms =3D migrate_get_current(); @@ -243,133 +248,161 @@ void hmp_info_migrate_parameters(Monitor *mon, cons= t QDict *qdict) MigrationState *s =3D migrate_get_current(); =20 params =3D qmp_query_migrate_parameters(NULL); + assert(params); =20 - if (params) { - monitor_printf(mon, "%s: %" PRIu64 " ms\n", - MigrationParameter_str(MIGRATION_PARAMETER_ANNOUNCE_INITIAL), - params->announce_initial); - monitor_printf(mon, "%s: %" PRIu64 " ms\n", - MigrationParameter_str(MIGRATION_PARAMETER_ANNOUNCE_MAX), - params->announce_max); - monitor_printf(mon, "%s: %" PRIu64 "\n", - MigrationParameter_str(MIGRATION_PARAMETER_ANNOUNCE_ROUNDS), - params->announce_rounds); - monitor_printf(mon, "%s: %" PRIu64 " ms\n", - MigrationParameter_str(MIGRATION_PARAMETER_ANNOUNCE_STEP), - params->announce_step); - assert(params->has_throttle_trigger_threshold); - monitor_printf(mon, "%s: %u\n", - MigrationParameter_str(MIGRATION_PARAMETER_THROTTLE_TRIGGER_TH= RESHOLD), - params->throttle_trigger_threshold); - assert(params->has_cpu_throttle_initial); - monitor_printf(mon, "%s: %u\n", - MigrationParameter_str(MIGRATION_PARAMETER_CPU_THROTTLE_INITIA= L), - params->cpu_throttle_initial); - assert(params->has_cpu_throttle_increment); - monitor_printf(mon, "%s: %u\n", - MigrationParameter_str(MIGRATION_PARAMETER_CPU_THROTTLE_INCREM= ENT), - params->cpu_throttle_increment); - assert(params->has_cpu_throttle_tailslow); - monitor_printf(mon, "%s: %s\n", - MigrationParameter_str(MIGRATION_PARAMETER_CPU_THROTTLE_TAILSL= OW), - params->cpu_throttle_tailslow ? "on" : "off"); - assert(params->has_max_cpu_throttle); - monitor_printf(mon, "%s: %u\n", - MigrationParameter_str(MIGRATION_PARAMETER_MAX_CPU_THROTTLE), - params->max_cpu_throttle); - assert(params->tls_creds); - monitor_printf(mon, "%s: '%s'\n", - MigrationParameter_str(MIGRATION_PARAMETER_TLS_CREDS), - params->tls_creds->u.s); - assert(params->tls_hostname); - monitor_printf(mon, "%s: '%s'\n", - MigrationParameter_str(MIGRATION_PARAMETER_TLS_HOSTNAME), - params->tls_hostname->u.s); - assert(params->has_max_bandwidth); - monitor_printf(mon, "%s: %" PRIu64 " bytes/second\n", - MigrationParameter_str(MIGRATION_PARAMETER_MAX_BANDWIDTH), - params->max_bandwidth); - assert(params->has_avail_switchover_bandwidth); - monitor_printf(mon, "%s: %" PRIu64 " bytes/second\n", - MigrationParameter_str(MIGRATION_PARAMETER_AVAIL_SWITCHOVER_BA= NDWIDTH), - params->avail_switchover_bandwidth); - assert(params->has_downtime_limit); - monitor_printf(mon, "%s: %" PRIu64 " ms\n", - MigrationParameter_str(MIGRATION_PARAMETER_DOWNTIME_LIMIT), - params->downtime_limit); - assert(params->has_x_checkpoint_delay); - monitor_printf(mon, "%s: %u ms\n", - MigrationParameter_str(MIGRATION_PARAMETER_X_CHECKPOINT_DELAY), - params->x_checkpoint_delay); - monitor_printf(mon, "%s: %u\n", - MigrationParameter_str(MIGRATION_PARAMETER_MULTIFD_CHANNELS), - params->multifd_channels); - monitor_printf(mon, "%s: %s\n", - MigrationParameter_str(MIGRATION_PARAMETER_MULTIFD_COMPRESSION= ), - MultiFDCompression_str(params->multifd_compression)); - assert(params->has_zero_page_detection); - monitor_printf(mon, "%s: %s\n", - MigrationParameter_str(MIGRATION_PARAMETER_ZERO_PAGE_DETECTION= ), - qapi_enum_lookup(&ZeroPageDetection_lookup, - params->zero_page_detection)); - monitor_printf(mon, "%s: %" PRIu64 " bytes\n", - MigrationParameter_str(MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE), - params->xbzrle_cache_size); - monitor_printf(mon, "%s: %" PRIu64 "\n", - MigrationParameter_str(MIGRATION_PARAMETER_MAX_POSTCOPY_BANDWI= DTH), - params->max_postcopy_bandwidth); - assert(params->tls_authz); - monitor_printf(mon, "%s: '%s'\n", - MigrationParameter_str(MIGRATION_PARAMETER_TLS_AUTHZ), - params->tls_authz->u.s); - - if (s->has_block_bitmap_mapping) { - const BitmapMigrationNodeAliasList *bmnal; - - monitor_printf(mon, "%s:\n", - MigrationParameter_str( - MIGRATION_PARAMETER_BLOCK_BITMAP_MAPPING)); - - for (bmnal =3D params->block_bitmap_mapping; - bmnal; - bmnal =3D bmnal->next) - { - const BitmapMigrationNodeAlias *bmna =3D bmnal->value; - const BitmapMigrationBitmapAliasList *bmbal; - - monitor_printf(mon, " '%s' -> '%s'\n", - bmna->node_name, bmna->alias); - - for (bmbal =3D bmna->bitmaps; bmbal; bmbal =3D bmbal->next= ) { - const BitmapMigrationBitmapAlias *bmba =3D bmbal->valu= e; - - monitor_printf(mon, " '%s' -> '%s'\n", - bmba->name, bmba->alias); - } + PARAM_INFO(params->has_announce_initial, + "%s: %" PRIu64 " ms\n", + MIGRATION_PARAMETER_ANNOUNCE_INITIAL, + params->announce_initial); + + PARAM_INFO(params->has_announce_max, + "%s: %" PRIu64 " ms\n", + MIGRATION_PARAMETER_ANNOUNCE_MAX, + params->announce_max); + + PARAM_INFO(params->has_announce_rounds, + "%s: %" PRIu64 "\n", + MIGRATION_PARAMETER_ANNOUNCE_ROUNDS, + params->announce_rounds); + + PARAM_INFO(params->has_announce_step, + "%s: %" PRIu64 " ms\n", + MIGRATION_PARAMETER_ANNOUNCE_STEP, + params->announce_step); + + PARAM_INFO(params->has_throttle_trigger_threshold, + "%s: %u\n", + MIGRATION_PARAMETER_THROTTLE_TRIGGER_THRESHOLD, + params->throttle_trigger_threshold); + + PARAM_INFO(params->has_cpu_throttle_initial, + "%s: %u\n", + MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL, + params->cpu_throttle_initial); + + PARAM_INFO(params->has_cpu_throttle_increment, + "%s: %u\n", + MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT, + params->cpu_throttle_increment); + + PARAM_INFO(params->has_cpu_throttle_tailslow, + "%s: %s\n", + MIGRATION_PARAMETER_CPU_THROTTLE_TAILSLOW, + params->cpu_throttle_tailslow ? "on" : "off"); + + PARAM_INFO(params->has_max_cpu_throttle, + "%s: %u\n", + MIGRATION_PARAMETER_MAX_CPU_THROTTLE, + params->max_cpu_throttle); + + PARAM_INFO(params->tls_creds, + "%s: '%s'\n", + MIGRATION_PARAMETER_TLS_CREDS, + params->tls_creds->u.s); + + PARAM_INFO(params->tls_hostname, + "%s: '%s'\n", + MIGRATION_PARAMETER_TLS_HOSTNAME, + params->tls_hostname->u.s); + + PARAM_INFO(params->has_max_bandwidth, + "%s: %" PRIu64 " bytes/second\n", + MIGRATION_PARAMETER_MAX_BANDWIDTH, + params->max_bandwidth); + + PARAM_INFO(params->has_avail_switchover_bandwidth, + "%s: %" PRIu64 " bytes/second\n", + MIGRATION_PARAMETER_AVAIL_SWITCHOVER_BANDWIDTH, + params->avail_switchover_bandwidth); + + PARAM_INFO(params->has_downtime_limit, + "%s: %" PRIu64 " ms\n", + MIGRATION_PARAMETER_DOWNTIME_LIMIT, + params->downtime_limit); + + PARAM_INFO(params->has_x_checkpoint_delay, + "%s: %u ms\n", + MIGRATION_PARAMETER_X_CHECKPOINT_DELAY, + params->x_checkpoint_delay); + + PARAM_INFO(params->has_multifd_channels, + "%s: %u\n", + MIGRATION_PARAMETER_MULTIFD_CHANNELS, + params->multifd_channels); + + PARAM_INFO(params->has_multifd_compression, + "%s: %s\n", + MIGRATION_PARAMETER_MULTIFD_COMPRESSION, + qapi_enum_lookup(&MultiFDCompression_lookup, + params->multifd_compression)); + + PARAM_INFO(params->has_zero_page_detection, + "%s: %s\n", + MIGRATION_PARAMETER_ZERO_PAGE_DETECTION, + qapi_enum_lookup(&ZeroPageDetection_lookup, + params->zero_page_detection)); + + PARAM_INFO(params->has_xbzrle_cache_size, + "%s: %" PRIu64 " bytes\n", + MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE, + params->xbzrle_cache_size); + + PARAM_INFO(params->has_max_postcopy_bandwidth, + "%s: %" PRIu64 "\n", + MIGRATION_PARAMETER_MAX_POSTCOPY_BANDWIDTH, + params->max_postcopy_bandwidth); + + PARAM_INFO(params->tls_authz, + "%s: '%s'\n", + MIGRATION_PARAMETER_TLS_AUTHZ, + params->tls_authz->u.s); + + if (s->has_block_bitmap_mapping) { + const BitmapMigrationNodeAliasList *bmnal; + + monitor_printf(mon, "%s:\n", + MigrationParameter_str( + MIGRATION_PARAMETER_BLOCK_BITMAP_MAPPING)); + + for (bmnal =3D params->block_bitmap_mapping; + bmnal; + bmnal =3D bmnal->next) + { + const BitmapMigrationNodeAlias *bmna =3D bmnal->value; + const BitmapMigrationBitmapAliasList *bmbal; + + monitor_printf(mon, " '%s' -> '%s'\n", + bmna->node_name, bmna->alias); + + for (bmbal =3D bmna->bitmaps; bmbal; bmbal =3D bmbal->next) { + const BitmapMigrationBitmapAlias *bmba =3D bmbal->value; + + monitor_printf(mon, " '%s' -> '%s'\n", + bmba->name, bmba->alias); } } - - monitor_printf(mon, "%s: %" PRIu64 " ms\n", - MigrationParameter_str(MIGRATION_PARAMETER_X_VCPU_DIRTY_LIMIT_PERI= OD), - params->x_vcpu_dirty_limit_period); - - monitor_printf(mon, "%s: %" PRIu64 " MB/s\n", - MigrationParameter_str(MIGRATION_PARAMETER_VCPU_DIRTY_LIMIT), - params->vcpu_dirty_limit); - - assert(params->has_mode); - monitor_printf(mon, "%s: %s\n", - MigrationParameter_str(MIGRATION_PARAMETER_MODE), - qapi_enum_lookup(&MigMode_lookup, params->mode)); - - if (params->has_direct_io) { - monitor_printf(mon, "%s: %s\n", - MigrationParameter_str( - MIGRATION_PARAMETER_DIRECT_IO), - params->direct_io ? "on" : "off"); - } } =20 + PARAM_INFO(params->has_x_vcpu_dirty_limit_period, + "%s: %" PRIu64 " ms\n", + MIGRATION_PARAMETER_X_VCPU_DIRTY_LIMIT_PERIOD, + params->x_vcpu_dirty_limit_period); + + PARAM_INFO(params->has_vcpu_dirty_limit, + "%s: %" PRIu64 " MB/s\n", + MIGRATION_PARAMETER_VCPU_DIRTY_LIMIT, + params->vcpu_dirty_limit); + + PARAM_INFO(params->has_mode, + "%s: %s\n", + MIGRATION_PARAMETER_MODE, + qapi_enum_lookup(&MigMode_lookup, params->mode)); + + PARAM_INFO(params->has_direct_io, + "%s: %s\n", + MIGRATION_PARAMETER_DIRECT_IO, + params->direct_io ? "on" : "off"); + qapi_free_MigrationParameters(params); } =20 --=20 2.35.3