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=1751313820; cv=none; d=zohomail.com; s=zohoarc; b=kFA6l1rkd4q90ShWTXF421oAQavD1mh2p1yxojDvo8/20fr06Mv/J2rCPcxu+Pm6tqIS8USNBYEkMr4V/0USZrGg3cc2VKnZMsMbbpErFMLbXu+suRALo3hmPPGIgrvDwYK3Ai0u0QfPl7iBZZs8D5U5VX0FhnxSyQF437vOKFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751313820; 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=txlgJDtkXvB0CtRoZohHCRzr0A+uz7zRbtBLhfVcjCw=; b=DW21vYc/Dm555XByV7OBx1/PE3rbFnUf16/me4CPkAPJ5+DyBKBunfH2oaKio+Y6yWtalqgK2xS/KVf/W4Eqv8LcFhkldCXMlvk5qLw8J9Bq2WH2BcPRLF5lYhsQ5vfXHFbULXamHXNSUfO0QlmgVW0rWioTsRaicSzNWLUdqI0= 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 1751313820718519.3914012007625; Mon, 30 Jun 2025 13:03:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uWKg1-0004fC-My; Mon, 30 Jun 2025 16:00:29 -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 1uWKfz-0004V6-2v for qemu-devel@nongnu.org; Mon, 30 Jun 2025 16:00:27 -0400 Received: from smtp-out2.suse.de ([2a07:de40:b251:101:10:150:64:2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uWKfw-0007kV-AT for qemu-devel@nongnu.org; Mon, 30 Jun 2025 16:00:26 -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-out2.suse.de (Postfix) with ESMTPS id 041341F393; Mon, 30 Jun 2025 19:59:48 +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 7A6281399F; Mon, 30 Jun 2025 19:59:46 +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 mHEFD7LsYmhQUAAAD6G6ig (envelope-from ); Mon, 30 Jun 2025 19:59:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1751313588; 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=txlgJDtkXvB0CtRoZohHCRzr0A+uz7zRbtBLhfVcjCw=; b=Ijf9MYvufS851Cm63skaECl02mDW3JPmKhZPUY5gsIvLTn9D6FWwno7FypH2+g8u24jLf+ VyhyS0pxjEsBOcnn/v4G57ny7xIzqWK3SA/md4v/quSD2UXab32tBlFxANr9b6okbMKf/K 12RZtPiBCkkxSSrLNK0tA2OAyfliuZw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1751313588; 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=txlgJDtkXvB0CtRoZohHCRzr0A+uz7zRbtBLhfVcjCw=; b=4Ea/suvxZYj6lFmGneo86+c515CrJDaQso7XUVvW7frEXAmDOi9FYlQ7JQErOKV1GHwLBL vmgTRebWvFt60cDA== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Ijf9MYvu; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="4Ea/suvx" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1751313588; 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=txlgJDtkXvB0CtRoZohHCRzr0A+uz7zRbtBLhfVcjCw=; b=Ijf9MYvufS851Cm63skaECl02mDW3JPmKhZPUY5gsIvLTn9D6FWwno7FypH2+g8u24jLf+ VyhyS0pxjEsBOcnn/v4G57ny7xIzqWK3SA/md4v/quSD2UXab32tBlFxANr9b6okbMKf/K 12RZtPiBCkkxSSrLNK0tA2OAyfliuZw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1751313588; 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=txlgJDtkXvB0CtRoZohHCRzr0A+uz7zRbtBLhfVcjCw=; b=4Ea/suvxZYj6lFmGneo86+c515CrJDaQso7XUVvW7frEXAmDOi9FYlQ7JQErOKV1GHwLBL vmgTRebWvFt60cDA== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: berrange@redhat.com, armbru@redhat.com, Peter Xu Subject: [PATCH v2 14/24] migration: Use visitors in migrate_params_test_apply Date: Mon, 30 Jun 2025 16:59:03 -0300 Message-Id: <20250630195913.28033-15-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: 041341F393 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)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:106:10:150:64:167:received,2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_ALL(0.00)[]; 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]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+] 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=2a07:de40:b251:101:10:150:64:2; 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, 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: 1751313822870116600 Content-Type: text/plain; charset="utf-8" Convert the code in migrate_params_test_apply() from an open-coded copy of every migration parameter to a copy using visitors. The current code has conditionals for each parameter's has_* field, which is exactly what the visitors do. This hides the details of QAPI from the migration code and avoids the need to update migrate_params_test_apply() every time a new migration parameter is added. Both were very confusing and while the visitor code can become a bit involved, there is no need for new contributors to ever touch it. Change the name of the function to a more direct reference of what it does: merging the user params with the temporary copy. Move the QAPI_CLONE_MEMBERS into the caller, so QAPI_CLONE can be used and there's no need to allocate memory in the migration code. Similarly, turn 'tmp' into a pointer so the proper qapi_free_ routine can be used. An extra call to migrate_mark_all_params_present() is now needed because the visitors update the has_ field for non-present fields, but we actually want them all set so migrate_params_apply() can copy all of them. Signed-off-by: Fabiano Rosas --- migration/options.c | 157 +++++++++++++++----------------------------- 1 file changed, 54 insertions(+), 103 deletions(-) diff --git a/migration/options.c b/migration/options.c index 6619b5f21a..695bec5b8f 100644 --- a/migration/options.c +++ b/migration/options.c @@ -20,6 +20,10 @@ #include "qapi/qapi-commands-migration.h" #include "qapi/qapi-visit-migration.h" #include "qapi/qmp/qerror.h" +#include "qapi/qobject-input-visitor.h" +#include "qapi/qobject-output-visitor.h" +#include "qapi/visitor.h" +#include "qobject/qdict.h" #include "qobject/qnull.h" #include "system/runstate.h" #include "migration/colo.h" @@ -1223,120 +1227,63 @@ bool migrate_params_check(MigrationParameters *par= ams, Error **errp) return true; } =20 -static void migrate_params_test_apply(MigrationParameters *params, - MigrationParameters *dest) +static bool migrate_params_merge(MigrationParameters *dst, + MigrationParameters *src, Error **errp) { - MigrationState *s =3D migrate_get_current(); + QObject *ret_out =3D NULL; + Visitor *v; + bool ok; =20 - QAPI_CLONE_MEMBERS(MigrationParameters, dest, &s->parameters); - - if (params->has_throttle_trigger_threshold) { - dest->throttle_trigger_threshold =3D params->throttle_trigger_thre= shold; - } - - if (params->has_cpu_throttle_initial) { - dest->cpu_throttle_initial =3D params->cpu_throttle_initial; - } - - if (params->has_cpu_throttle_increment) { - dest->cpu_throttle_increment =3D params->cpu_throttle_increment; + /* free memory from pointers that are about to be assigned */ + if (src->has_block_bitmap_mapping) { + qapi_free_BitmapMigrationNodeAliasList(dst->block_bitmap_mapping); } =20 - if (params->has_cpu_throttle_tailslow) { - dest->cpu_throttle_tailslow =3D params->cpu_throttle_tailslow; + if (src->tls_creds) { + qapi_free_StrOrNull(dst->tls_creds); } =20 - if (params->tls_creds) { - qapi_free_StrOrNull(dest->tls_creds); - dest->tls_creds =3D QAPI_CLONE(StrOrNull, params->tls_creds); + if (src->tls_hostname) { + qapi_free_StrOrNull(dst->tls_hostname); } =20 - if (params->tls_hostname) { - qapi_free_StrOrNull(dest->tls_hostname); - dest->tls_hostname =3D QAPI_CLONE(StrOrNull, params->tls_hostname); + if (src->tls_authz) { + qapi_free_StrOrNull(dst->tls_authz); } =20 - if (params->tls_authz) { - qapi_free_StrOrNull(dest->tls_authz); - dest->tls_authz =3D QAPI_CLONE(StrOrNull, params->tls_authz); + /* read in from src */ + v =3D qobject_output_visitor_new(&ret_out); + ok =3D visit_type_MigrationParameters(v, NULL, &src, errp); + if (!ok) { + goto out; } + visit_complete(v, &ret_out); + visit_free(v); =20 - if (params->has_max_bandwidth) { - dest->max_bandwidth =3D params->max_bandwidth; + /* + * Write to dst but leave existing fields intact (except for has_* + * which will be updated according to their presence in src). + */ + v =3D qobject_input_visitor_new(ret_out); + ok =3D visit_start_struct(v, NULL, NULL, 0, errp); + if (!ok) { + goto out; } - - if (params->has_avail_switchover_bandwidth) { - dest->avail_switchover_bandwidth =3D params->avail_switchover_band= width; + ok =3D visit_type_MigrationParameters_members(v, dst, errp); + if (!ok) { + goto out; } - - if (params->has_downtime_limit) { - dest->downtime_limit =3D params->downtime_limit; + ok =3D visit_check_struct(v, errp); + visit_end_struct(v, NULL); + if (!ok) { + goto out; } =20 - if (params->has_x_checkpoint_delay) { - dest->x_checkpoint_delay =3D params->x_checkpoint_delay; - } +out: + visit_free(v); + qobject_unref(ret_out); =20 - if (params->has_multifd_channels) { - dest->multifd_channels =3D params->multifd_channels; - } - if (params->has_multifd_compression) { - dest->multifd_compression =3D params->multifd_compression; - } - if (params->has_multifd_qatzip_level) { - dest->multifd_qatzip_level =3D params->multifd_qatzip_level; - } - if (params->has_multifd_zlib_level) { - dest->multifd_zlib_level =3D params->multifd_zlib_level; - } - if (params->has_multifd_zstd_level) { - dest->multifd_zstd_level =3D params->multifd_zstd_level; - } - if (params->has_xbzrle_cache_size) { - dest->xbzrle_cache_size =3D params->xbzrle_cache_size; - } - if (params->has_max_postcopy_bandwidth) { - dest->max_postcopy_bandwidth =3D params->max_postcopy_bandwidth; - } - if (params->has_max_cpu_throttle) { - dest->max_cpu_throttle =3D params->max_cpu_throttle; - } - if (params->has_announce_initial) { - dest->announce_initial =3D params->announce_initial; - } - if (params->has_announce_max) { - dest->announce_max =3D params->announce_max; - } - if (params->has_announce_rounds) { - dest->announce_rounds =3D params->announce_rounds; - } - if (params->has_announce_step) { - dest->announce_step =3D params->announce_step; - } - - if (params->has_block_bitmap_mapping) { - dest->block_bitmap_mapping =3D params->block_bitmap_mapping; - } - - if (params->has_x_vcpu_dirty_limit_period) { - dest->x_vcpu_dirty_limit_period =3D - params->x_vcpu_dirty_limit_period; - } - if (params->has_vcpu_dirty_limit) { - dest->vcpu_dirty_limit =3D params->vcpu_dirty_limit; - } - - if (params->has_mode) { - dest->mode =3D params->mode; - } - - if (params->has_zero_page_detection) { - dest->zero_page_detection =3D params->zero_page_detection; - } - - if (params->has_direct_io) { - dest->direct_io =3D params->direct_io; - } + return ok; } =20 static void migrate_params_apply(MigrationParameters *params) @@ -1353,7 +1300,9 @@ static void migrate_params_apply(MigrationParameters = *params) =20 void qmp_migrate_set_parameters(MigrationParameters *params, Error **errp) { - MigrationParameters tmp; + MigrationState *s =3D migrate_get_current(); + g_autoptr(MigrationParameters) tmp =3D QAPI_CLONE(MigrationParameters, + &s->parameters); =20 /* * Convert QTYPE_QNULL and NULL to the empty string (""). Even @@ -1367,7 +1316,9 @@ void qmp_migrate_set_parameters(MigrationParameters *= params, Error **errp) tls_opt_to_str(¶ms->tls_hostname); tls_opt_to_str(¶ms->tls_authz); =20 - migrate_params_test_apply(params, &tmp); + if (!migrate_params_merge(tmp, params, errp)) { + return; + } =20 /* * Mark block_bitmap_mapping as present now while we have the @@ -1377,10 +1328,10 @@ void qmp_migrate_set_parameters(MigrationParameters= *params, Error **errp) migrate_get_current()->has_block_bitmap_mapping =3D true; } =20 - if (migrate_params_check(&tmp, errp)) { - migrate_params_apply(&tmp); + if (migrate_params_check(tmp, errp)) { + /* mark all present, so they're all copied */ + migrate_mark_all_params_present(tmp); + migrate_params_apply(tmp); migrate_post_update_params(params, errp); } - - migrate_tls_opts_free(&tmp); } --=20 2.35.3