From nobody Fri Nov 14 23:30:28 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=linux.alibaba.com ARC-Seal: i=1; a=rsa-sha256; t=1759133150; cv=none; d=zohomail.com; s=zohoarc; b=GDKXTzKmqRLiBz3Kajs+KfFPFhO1Z+/gnSipyXKr36Vrmg0fTH0dGXRy8lRyDqJkfrpTbk9ZRKA4mnaTu9jmDU+VOU5MSBkycYepdsncD7+5izmaPZ9/TNdeq5T/O62y47wMN+Cp3D5lb4cL+pFHtU06OBE42tECJTB5eN3Hg1k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759133150; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=35YsRLIzqfWT6Rz5F7DY1fnB12isAT2RdCstv+znKAk=; b=ahWe0KbUSqSha+oue5aCZpcunQE+2EwU9v4wV5OsRT943FVHe+f6IeewYa9jOkA6mdWPVCYGMM3Y7KVmr6KeeLiQPHdrRkE6lOoGC1z1CjMR1xpdfubP9bXMB9xiydHnYE5i8lqdb1JYi29+K9uItSO0SLasFieRlDlcFcLYwAY= 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 1759133150426642.0433038682826; Mon, 29 Sep 2025 01:05:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v38rA-0004sD-SC; Mon, 29 Sep 2025 04:03:38 -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 1v38pm-0004dl-RQ for qemu-devel@nongnu.org; Mon, 29 Sep 2025 04:02:13 -0400 Received: from [115.124.30.97] (helo=out30-97.freemail.mail.aliyun.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v38pS-0002ci-NE for qemu-devel@nongnu.org; Mon, 29 Sep 2025 04:02:07 -0400 Received: from localhost(mailfrom:guobin@linux.alibaba.com fp:SMTPD_---0Wp0tOIt_1759132876 cluster:ay36) by smtp.aliyun-inc.com; Mon, 29 Sep 2025 16:01:24 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1759132885; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=35YsRLIzqfWT6Rz5F7DY1fnB12isAT2RdCstv+znKAk=; b=KRHsfbANFApeFVcyYZitXQrHbTg9d8qqR8RKyWGwjTQU0OSEgiaS5i6jqc4bVSsygJ+iAy37m1EbofkqLDrhoQIIUYui7X5itUBt3wI7ENpIMOXz8+MNHmnXzBsSBTe+vTPEuk6CptrVjUeV86rvbQAQsTfC61h9q60jeAB0zTo= From: Bin Guo To: qemu-devel@nongnu.org Cc: peterx@redhat.com, farosas@suse.de Subject: [PATCH] migration: Use QAPI_CLONE() instead of duplicating it inline Date: Mon, 29 Sep 2025 16:01:15 +0800 Message-Id: <20250929080115.98072-1-guobin@linux.alibaba.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 115.124.30.97 (deferred) 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=115.124.30.97; envelope-from=guobin@linux.alibaba.com; helo=out30-97.freemail.mail.aliyun.com X-Spam_score_int: -166 X-Spam_score: -16.7 X-Spam_bar: ---------------- X-Spam_report: (-16.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001, USER_IN_DEF_DKIM_WL=-7.5, USER_IN_DEF_SPF_WL=-7.5 autolearn=no 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 @linux.alibaba.com) X-ZM-MESSAGEID: 1759133151805116601 Content-Type: text/plain; charset="utf-8" It's better to use QAPI_CLONE() in qmp_query_migrate_parameters so that the code is cleaner. No functional changes intended. Signed-off-by: Bin Guo --- migration/options.c | 70 ++------------------------------------------- 1 file changed, 3 insertions(+), 67 deletions(-) diff --git a/migration/options.c b/migration/options.c index 4e923a2e07..347d762b03 100644 --- a/migration/options.c +++ b/migration/options.c @@ -892,81 +892,16 @@ AnnounceParameters *migrate_announce_params(void) =20 MigrationParameters *qmp_query_migrate_parameters(Error **errp) { - MigrationParameters *params; MigrationState *s =3D migrate_get_current(); =20 - /* TODO use QAPI_CLONE() instead of duplicating it inline */ - params =3D g_malloc0(sizeof(*params)); - params->has_throttle_trigger_threshold =3D true; - params->throttle_trigger_threshold =3D s->parameters.throttle_trigger_= threshold; - params->has_cpu_throttle_initial =3D true; - params->cpu_throttle_initial =3D s->parameters.cpu_throttle_initial; - params->has_cpu_throttle_increment =3D true; - params->cpu_throttle_increment =3D s->parameters.cpu_throttle_incremen= t; - params->has_cpu_throttle_tailslow =3D true; - params->cpu_throttle_tailslow =3D s->parameters.cpu_throttle_tailslow; - params->tls_creds =3D g_strdup(s->parameters.tls_creds); - params->tls_hostname =3D g_strdup(s->parameters.tls_hostname); - params->tls_authz =3D g_strdup(s->parameters.tls_authz ? - s->parameters.tls_authz : ""); - params->has_max_bandwidth =3D true; - params->max_bandwidth =3D s->parameters.max_bandwidth; - params->has_avail_switchover_bandwidth =3D true; - params->avail_switchover_bandwidth =3D s->parameters.avail_switchover_= bandwidth; - params->has_downtime_limit =3D true; - params->downtime_limit =3D s->parameters.downtime_limit; - params->has_x_checkpoint_delay =3D true; - params->x_checkpoint_delay =3D s->parameters.x_checkpoint_delay; - params->has_multifd_channels =3D true; - params->multifd_channels =3D s->parameters.multifd_channels; - params->has_multifd_compression =3D true; - params->multifd_compression =3D s->parameters.multifd_compression; - params->has_multifd_zlib_level =3D true; - params->multifd_zlib_level =3D s->parameters.multifd_zlib_level; - params->has_multifd_qatzip_level =3D true; - params->multifd_qatzip_level =3D s->parameters.multifd_qatzip_level; - params->has_multifd_zstd_level =3D true; - params->multifd_zstd_level =3D s->parameters.multifd_zstd_level; - params->has_xbzrle_cache_size =3D true; - params->xbzrle_cache_size =3D s->parameters.xbzrle_cache_size; - params->has_max_postcopy_bandwidth =3D true; - params->max_postcopy_bandwidth =3D s->parameters.max_postcopy_bandwidt= h; - params->has_max_cpu_throttle =3D true; - params->max_cpu_throttle =3D s->parameters.max_cpu_throttle; - params->has_announce_initial =3D true; - params->announce_initial =3D s->parameters.announce_initial; - params->has_announce_max =3D true; - params->announce_max =3D s->parameters.announce_max; - params->has_announce_rounds =3D true; - params->announce_rounds =3D s->parameters.announce_rounds; - params->has_announce_step =3D true; - params->announce_step =3D s->parameters.announce_step; - - if (s->parameters.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_x_vcpu_dirty_limit_period =3D true; - params->x_vcpu_dirty_limit_period =3D s->parameters.x_vcpu_dirty_limit= _period; - params->has_vcpu_dirty_limit =3D true; - params->vcpu_dirty_limit =3D s->parameters.vcpu_dirty_limit; - params->has_mode =3D true; - params->mode =3D s->parameters.mode; - params->has_zero_page_detection =3D true; - params->zero_page_detection =3D s->parameters.zero_page_detection; - params->has_direct_io =3D true; - params->direct_io =3D s->parameters.direct_io; - - return params; + return QAPI_CLONE(MigrationParameters, &s->parameters); } =20 void migrate_params_init(MigrationParameters *params) { params->tls_hostname =3D g_strdup(""); params->tls_creds =3D g_strdup(""); + params->tls_authz =3D g_strdup(""); =20 /* Set has_* up only for parameter checks */ params->has_throttle_trigger_threshold =3D true; @@ -974,6 +909,7 @@ void migrate_params_init(MigrationParameters *params) params->has_cpu_throttle_increment =3D true; params->has_cpu_throttle_tailslow =3D true; params->has_max_bandwidth =3D true; + params->has_avail_switchover_bandwidth =3D true; params->has_downtime_limit =3D true; params->has_x_checkpoint_delay =3D true; params->has_multifd_channels =3D true; --=20 2.39.5