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=1748914778; cv=none; d=zohomail.com; s=zohoarc; b=Gc+v5cHi9lAs9czervxwJw/AxEu6diwtwPKhBRkChFEdvQHzPTC7qqyf9AanlVVygafyLoXoxAzaOaQILjMosKnunH8UL+hNg3XeYBzOyvoD8pjvHR3JhsodSo0Fkj/68Oz8rRKuv0EVXxcAc7pZcFgJOgOLgKIFpuOSM39nf38= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748914778; 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=UVPvDwK/cwUWk0r7xb0UxvXzlrJhpqrz5XX83nElAXM=; b=ibjc5M6tLJl0seCUnwMenzaTYCjr+kkpYiSMda6xECtEI4oGeb6TMndBCLuxH69lIMrRr/NMyWR3ZiU/o0Qd0V0WLohn8Mgvuq5B8UViSYgTr0kkcfQmP6o4sKwo5pXGoJHmqBf6VvJ0HGQN2PQ/OUwJwWikLaKCtfsB0vCgihc= 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 1748914778325393.0907411742853; Mon, 2 Jun 2025 18:39:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uMGcF-0006if-La; Mon, 02 Jun 2025 21:38:59 -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 1uMGcE-0006iN-GB for qemu-devel@nongnu.org; Mon, 02 Jun 2025 21:38:58 -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 1uMGcC-0001X7-Tm for qemu-devel@nongnu.org; Mon, 02 Jun 2025 21:38:58 -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 382711F38D; Tue, 3 Jun 2025 01:38:35 +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 A9F0E13700; Tue, 3 Jun 2025 01:38:33 +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 EMuWGhlSPmiNLwAAD6G6ig (envelope-from ); Tue, 03 Jun 2025 01:38:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1748914715; 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=UVPvDwK/cwUWk0r7xb0UxvXzlrJhpqrz5XX83nElAXM=; b=jnKjGrGZagbFm+6WYykb7JCftwF8GSvfK3gJw+H4DmiNP/PeHI6X3l+SCyap+Q+v1BROTf BSwHhXD4UKQdPDn1VVt3EaOeRNZ8DADwiQOG12xIgvtJFn7Lh/hiBJnWuenmt/CSRYbJg1 NLBXs2k5xnVCYyEJSkVVxMfNUN0Ndrc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1748914715; 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=UVPvDwK/cwUWk0r7xb0UxvXzlrJhpqrz5XX83nElAXM=; b=r+0e6nUmC3UvfopI8WjL3JdoUDWXJj08M7+5kFryASZdoAWtM3EfYO93eAfnt4oSjD0xfL X/gqTr8BqQLOuZCw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=jnKjGrGZ; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=r+0e6nUm DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1748914715; 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=UVPvDwK/cwUWk0r7xb0UxvXzlrJhpqrz5XX83nElAXM=; b=jnKjGrGZagbFm+6WYykb7JCftwF8GSvfK3gJw+H4DmiNP/PeHI6X3l+SCyap+Q+v1BROTf BSwHhXD4UKQdPDn1VVt3EaOeRNZ8DADwiQOG12xIgvtJFn7Lh/hiBJnWuenmt/CSRYbJg1 NLBXs2k5xnVCYyEJSkVVxMfNUN0Ndrc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1748914715; 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=UVPvDwK/cwUWk0r7xb0UxvXzlrJhpqrz5XX83nElAXM=; b=r+0e6nUmC3UvfopI8WjL3JdoUDWXJj08M7+5kFryASZdoAWtM3EfYO93eAfnt4oSjD0xfL X/gqTr8BqQLOuZCw== 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 10/21] migration: Use QAPI_CLONE_MEMBERS in query_migrate_parameters Date: Mon, 2 Jun 2025 22:37:59 -0300 Message-Id: <20250603013810.4772-11-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-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; 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)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Queue-Id: 382711F38D X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org 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.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: 1748914779718116600 Content-Type: text/plain; charset="utf-8" QAPI_CLONE_MEMBERS is a better option than copying parameters one by one because it operates on the entire struct and follows pointers. It also avoids the need to alter this function every time a new parameter is added. Note, since this is a deep clone, now we must free the TLS strings before assignment. Signed-off-by: Fabiano Rosas --- migration/options.c | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/migration/options.c b/migration/options.c index dd62e726cb..0a2a3050ec 100644 --- a/migration/options.c +++ b/migration/options.c @@ -918,7 +918,9 @@ static void tls_option_set_str(StrOrNull **dstp, StrOrN= ull *src) { StrOrNull *dst =3D *dstp; =20 - assert(!dst); + if (dst) { + qapi_free_StrOrNull(dst); + } =20 dst =3D *dstp =3D g_new0(StrOrNull, 1); dst->type =3D QTYPE_QSTRING; @@ -975,42 +977,17 @@ MigrationParameters *qmp_query_migrate_parameters(Err= or **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)); =20 - params->throttle_trigger_threshold =3D s->parameters.throttle_trigger_= threshold; - params->cpu_throttle_initial =3D s->parameters.cpu_throttle_initial; - params->cpu_throttle_increment =3D s->parameters.cpu_throttle_incremen= t; - params->cpu_throttle_tailslow =3D s->parameters.cpu_throttle_tailslow; + QAPI_CLONE_MEMBERS(MigrationParameters, params, &s->parameters); =20 tls_option_set_str(¶ms->tls_creds, s->parameters.tls_creds); tls_option_set_str(¶ms->tls_hostname, s->parameters.tls_hostname); tls_option_set_str(¶ms->tls_authz, s->parameters.tls_authz); =20 - params->max_bandwidth =3D s->parameters.max_bandwidth; - params->avail_switchover_bandwidth =3D s->parameters.avail_switchover_= bandwidth; - params->downtime_limit =3D s->parameters.downtime_limit; - params->x_checkpoint_delay =3D s->parameters.x_checkpoint_delay; - params->multifd_channels =3D s->parameters.multifd_channels; - params->multifd_compression =3D s->parameters.multifd_compression; - params->multifd_zlib_level =3D s->parameters.multifd_zlib_level; - params->multifd_qatzip_level =3D s->parameters.multifd_qatzip_level; - params->multifd_zstd_level =3D s->parameters.multifd_zstd_level; - params->xbzrle_cache_size =3D s->parameters.xbzrle_cache_size; - params->max_postcopy_bandwidth =3D s->parameters.max_postcopy_bandwidt= h; - params->max_cpu_throttle =3D s->parameters.max_cpu_throttle; - params->announce_initial =3D s->parameters.announce_initial; - params->announce_max =3D s->parameters.announce_max; - params->announce_rounds =3D s->parameters.announce_rounds; - params->announce_step =3D s->parameters.announce_step; params->block_bitmap_mapping =3D QAPI_CLONE(BitmapMigrationNodeAliasList, s->parameters.block_bitmap_mapping); - params->x_vcpu_dirty_limit_period =3D s->parameters.x_vcpu_dirty_limit= _period; - params->vcpu_dirty_limit =3D s->parameters.vcpu_dirty_limit; - params->mode =3D s->parameters.mode; - params->zero_page_detection =3D s->parameters.zero_page_detection; - params->direct_io =3D s->parameters.direct_io; =20 /* * query-migrate-parameters expects all members of --=20 2.35.3