From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7B5BAC5AD49 for ; Fri, 6 Jun 2025 15:53:32 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uNZNX-0002un-92; Fri, 06 Jun 2025 11:53:11 -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 1uNZNV-0002uf-Ox for qemu-devel@nongnu.org; Fri, 06 Jun 2025 11:53:09 -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 1uNZNT-0003IR-Uq for qemu-devel@nongnu.org; Fri, 06 Jun 2025 11:53:09 -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 94A0E21114; Fri, 6 Jun 2025 15:53:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1749225186; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=eW4PgkcU+hT9kAZ16+h5G11LLhU0pnWGXB1G3V53Jwc=; b=k8C3HcloMT4UotIKQVFDrGSPAeVsFdB6vxe/XOTE9pQn/wccQb4OTlPU8Gs3V+X2zJX4nC 0vcF1AzITI8MHtxO6H/qP7W5CmfZwP2Q0gJePZbwT0jmEfB+RvRFR1Awq7kolrxJnwgQku 13XvUMi97W6H5TWHOuckPQVmOvG9aUM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1749225186; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=eW4PgkcU+hT9kAZ16+h5G11LLhU0pnWGXB1G3V53Jwc=; b=S60fIn9o5fQsKXoo8l0zGCHtbTOtgo4UKqhU9J0OnGij7MjhsQ7w6HjUEoPeQxjnsGnS9X B4+HrgH4VLA8LYCA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=k8C3Hclo; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=S60fIn9o DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1749225186; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=eW4PgkcU+hT9kAZ16+h5G11LLhU0pnWGXB1G3V53Jwc=; b=k8C3HcloMT4UotIKQVFDrGSPAeVsFdB6vxe/XOTE9pQn/wccQb4OTlPU8Gs3V+X2zJX4nC 0vcF1AzITI8MHtxO6H/qP7W5CmfZwP2Q0gJePZbwT0jmEfB+RvRFR1Awq7kolrxJnwgQku 13XvUMi97W6H5TWHOuckPQVmOvG9aUM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1749225186; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=eW4PgkcU+hT9kAZ16+h5G11LLhU0pnWGXB1G3V53Jwc=; b=S60fIn9o5fQsKXoo8l0zGCHtbTOtgo4UKqhU9J0OnGij7MjhsQ7w6HjUEoPeQxjnsGnS9X B4+HrgH4VLA8LYCA== 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 152031336F; Fri, 6 Jun 2025 15:53:05 +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 ngAbMuEOQ2g3MwAAD6G6ig (envelope-from ); Fri, 06 Jun 2025 15:53:05 +0000 From: Fabiano Rosas To: Peter Xu Cc: qemu-devel@nongnu.org, Markus Armbruster , =?utf-8?Q?Daniel_P_=2E_Berrang=C3=A9?= Subject: Re: [PATCH 10/21] migration: Use QAPI_CLONE_MEMBERS in query_migrate_parameters In-Reply-To: References: <20250603013810.4772-1-farosas@suse.de> <20250603013810.4772-11-farosas@suse.de> Date: Fri, 06 Jun 2025 12:53:03 -0300 Message-ID: <87a56kx3xc.fsf@suse.de> MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Queue-Id: 94A0E21114 X-Rspamd-Action: no action X-Spamd-Result: default: False [-4.51 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; 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)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_TLS_ALL(0.00)[]; MIME_TRACE(0.00)[0:+]; MISSING_XM_UA(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_SOME(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; MID_RHS_MATCH_FROM(0.00)[]; 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)[suse.de:mid,suse.de:dkim,suse.de:email,imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] Received-SPF: pass client-ip=195.135.223.130; envelope-from=farosas@suse.de; helo=smtp-out1.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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Peter Xu writes: > On Mon, Jun 02, 2025 at 10:37:59PM -0300, Fabiano Rosas wrote: >> 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, StrOrNull *src) >> { >> StrOrNull *dst = *dstp; >> >> - assert(!dst); >> + if (dst) { >> + qapi_free_StrOrNull(dst); >> + } >> >> dst = *dstp = g_new0(StrOrNull, 1); >> dst->type = QTYPE_QSTRING; >> @@ -975,42 +977,17 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp) >> MigrationParameters *params; >> MigrationState *s = migrate_get_current(); >> >> - /* TODO use QAPI_CLONE() instead of duplicating it inline */ >> params = g_malloc0(sizeof(*params)); >> >> - params->throttle_trigger_threshold = s->parameters.throttle_trigger_threshold; >> - params->cpu_throttle_initial = s->parameters.cpu_throttle_initial; >> - params->cpu_throttle_increment = s->parameters.cpu_throttle_increment; >> - params->cpu_throttle_tailslow = s->parameters.cpu_throttle_tailslow; >> + QAPI_CLONE_MEMBERS(MigrationParameters, params, &s->parameters); >> >> 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); >> >> - params->max_bandwidth = s->parameters.max_bandwidth; >> - params->avail_switchover_bandwidth = s->parameters.avail_switchover_bandwidth; >> - params->downtime_limit = s->parameters.downtime_limit; >> - params->x_checkpoint_delay = s->parameters.x_checkpoint_delay; >> - params->multifd_channels = s->parameters.multifd_channels; >> - params->multifd_compression = s->parameters.multifd_compression; >> - params->multifd_zlib_level = s->parameters.multifd_zlib_level; >> - params->multifd_qatzip_level = s->parameters.multifd_qatzip_level; >> - params->multifd_zstd_level = s->parameters.multifd_zstd_level; >> - params->xbzrle_cache_size = s->parameters.xbzrle_cache_size; >> - params->max_postcopy_bandwidth = s->parameters.max_postcopy_bandwidth; >> - params->max_cpu_throttle = s->parameters.max_cpu_throttle; >> - params->announce_initial = s->parameters.announce_initial; >> - params->announce_max = s->parameters.announce_max; >> - params->announce_rounds = s->parameters.announce_rounds; >> - params->announce_step = s->parameters.announce_step; >> params->block_bitmap_mapping = >> QAPI_CLONE(BitmapMigrationNodeAliasList, >> s->parameters.block_bitmap_mapping); > > Wouldn't the QAPI_CLONE_MEMBERS() have deep cloned this too? > Hmm, I think it should. But it definitely broke something without this line. I'll double check. >> - params->x_vcpu_dirty_limit_period = s->parameters.x_vcpu_dirty_limit_period; >> - params->vcpu_dirty_limit = s->parameters.vcpu_dirty_limit; >> - params->mode = s->parameters.mode; >> - params->zero_page_detection = s->parameters.zero_page_detection; >> - params->direct_io = s->parameters.direct_io; >> >> /* >> * query-migrate-parameters expects all members of >> -- >> 2.35.3 >>