From nobody Sat Nov 15 19:04:44 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=1748914892; cv=none; d=zohomail.com; s=zohoarc; b=Bg5HIz/1/WveRp3iMHGN1TBqhSiw/xIXzZ3DYe9pN0pz8sO5hkD35saZ8I213pYU2bOR4mq7YTz5zOm7kQcGDWLTIEqtAAdo8harezTSGdcj8QgCiz1a9NKZv7UEbg12nLw+rl0BJ50LqDKL2W7sBeRD18FYs1n6Ti623s+n/BM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748914892; 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=1HSojfG//HAWlMfDLj1Grw57riRmTWe09NMmrKcaUY4=; b=KJnNuiyaPdairTp7wmT97uJRkxEpGKvNJcV2WYsvMFItYmubLx65TTyv5kY6kIKHhtSsGH0rwC/3VNT0T36+BwQcf4Ums71Jy7Q2XfNJf1HilYa+ZM/oMjPRy1ameVGofmwjVg95so13Wf4w3SIyal6SHgpWayXF7jYQ4/GZU8Y= 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 1748914892506816.2878488401512; Mon, 2 Jun 2025 18:41:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uMGc3-0006Ym-ML; Mon, 02 Jun 2025 21:38:47 -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 1uMGc2-0006YX-64 for qemu-devel@nongnu.org; Mon, 02 Jun 2025 21:38:46 -0400 Received: from smtp-out2.suse.de ([195.135.223.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uMGc0-0001Ua-KP for qemu-devel@nongnu.org; Mon, 02 Jun 2025 21:38:45 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [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-out2.suse.de (Postfix) with ESMTPS id 2E50F1F441; Tue, 3 Jun 2025 01:38:29 +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 9550913700; Tue, 3 Jun 2025 01:38:27 +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 sBKCFRNSPmiNLwAAD6G6ig (envelope-from ); Tue, 03 Jun 2025 01:38:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1748914709; 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=1HSojfG//HAWlMfDLj1Grw57riRmTWe09NMmrKcaUY4=; b=U2M+sIoIfSxVH+7z+u169Y+sTLh1bWaA5edlTB2g5dTz2gmONZdrPjBjVww4mnw8VOT0aQ gfZWf0D94hLSykonmDBPxLcdj4LjpTlahPSmRktkR6iwKTOAmXUlhwD9pqJ444K03d2lvI JcCydiDfJtHRTWamf0paq/wXPUVEDeg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1748914709; 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=1HSojfG//HAWlMfDLj1Grw57riRmTWe09NMmrKcaUY4=; b=1ZIGDDxkAlCzhu26EqSnc+CbxmcxVtVFwBId1L+bw0Nhl0DtV9z8xlZTA32R5LeCIe22Qf AvTnRYebDcPHBdAQ== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1748914709; 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=1HSojfG//HAWlMfDLj1Grw57riRmTWe09NMmrKcaUY4=; b=U2M+sIoIfSxVH+7z+u169Y+sTLh1bWaA5edlTB2g5dTz2gmONZdrPjBjVww4mnw8VOT0aQ gfZWf0D94hLSykonmDBPxLcdj4LjpTlahPSmRktkR6iwKTOAmXUlhwD9pqJ444K03d2lvI JcCydiDfJtHRTWamf0paq/wXPUVEDeg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1748914709; 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=1HSojfG//HAWlMfDLj1Grw57riRmTWe09NMmrKcaUY4=; b=1ZIGDDxkAlCzhu26EqSnc+CbxmcxVtVFwBId1L+bw0Nhl0DtV9z8xlZTA32R5LeCIe22Qf AvTnRYebDcPHBdAQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Markus Armbruster , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH 07/21] migration: Set block_bitmap_mapping unconditionally in query-migrate-parameters Date: Mon, 2 Jun 2025 22:37:56 -0300 Message-Id: <20250603013810.4772-8-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20250603013810.4772-1-farosas@suse.de> References: <20250603013810.4772-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.80 X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo]; RCVD_TLS_ALL(0.00)[] 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.131; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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.001, 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) X-ZM-MESSAGEID: 1748914893209116600 Content-Type: text/plain; charset="utf-8" The response type of query-migrate-parameters is MigrationParameters, the members of which are marked as optional in migration.json. However, the design of query-migrate-parameters is that all members are to be non-optional. The optionality is an attempt at compatibility with MigrateSetParameters, which needs it to allow migrate-set-parameters to be given only a subset of parameters. To satisfy the design of query-migrate-parameters, the qmp_query_migrate_parameters function sets all (but one) has_* fields of MigrationParameters to true before returning. The block-bitmap-mapping parameter is instead set conditionally. This is incorrect. Since block-bitmap-mapping is allowed to be passed as input by the user as an empty list, technically the empty list value output in query-migrate-parameters has always been valid for that parameter. Make the parameter non-optional like the rest of MigrationParameters. Signed-off-by: Fabiano Rosas --- migration/migration-hmp-cmds.c | 36 ++++++++++++++++------------------ migration/options.c | 10 ++++------ 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c index aacffdc532..685c8ebd53 100644 --- a/migration/migration-hmp-cmds.c +++ b/migration/migration-hmp-cmds.c @@ -240,6 +240,7 @@ void hmp_info_migrate_capabilities(Monitor *mon, const = QDict *qdict) void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict) { MigrationParameters *params; + const BitmapMigrationNodeAliasList *bmnal; =20 params =3D qmp_query_migrate_parameters(NULL); =20 @@ -319,29 +320,26 @@ void hmp_info_migrate_parameters(Monitor *mon, const = QDict *qdict) MigrationParameter_str(MIGRATION_PARAMETER_TLS_AUTHZ), params->tls_authz ? params->tls_authz->u.s : ""); =20 - if (params->has_block_bitmap_mapping) { - const BitmapMigrationNodeAliasList *bmnal; + assert(params->has_block_bitmap_mapping); + monitor_printf(mon, "%s:\n", + MigrationParameter_str( + MIGRATION_PARAMETER_BLOCK_BITMAP_MAPPING)); =20 - 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; =20 - 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); =20 - 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; =20 - 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); - } + monitor_printf(mon, " '%s' -> '%s'\n", + bmba->name, bmba->alias); } } =20 diff --git a/migration/options.c b/migration/options.c index d4021bc520..190001f8ac 100644 --- a/migration/options.c +++ b/migration/options.c @@ -989,12 +989,10 @@ MigrationParameters *qmp_query_migrate_parameters(Err= or **errp) params->has_announce_step =3D true; params->announce_step =3D s->parameters.announce_step; =20 - if (s->has_block_bitmap_mapping) { - params->has_block_bitmap_mapping =3D true; - params->block_bitmap_mapping =3D - QAPI_CLONE(BitmapMigrationNodeAliasList, - s->parameters.block_bitmap_mapping); - } + params->has_block_bitmap_mapping =3D true; + params->block_bitmap_mapping =3D + QAPI_CLONE(BitmapMigrationNodeAliasList, + s->parameters.block_bitmap_mapping); =20 params->has_x_vcpu_dirty_limit_period =3D true; params->x_vcpu_dirty_limit_period =3D s->parameters.x_vcpu_dirty_limit= _period; --=20 2.35.3