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 0997CC369A2 for ; Mon, 14 Apr 2025 17:03:11 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u4NCb-0005Sm-Hp; Mon, 14 Apr 2025 13:02:33 -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 1u4NCS-0005Pp-VQ for qemu-devel@nongnu.org; Mon, 14 Apr 2025 13:02:25 -0400 Received: from smtp-out1.suse.de ([2a07:de40:b251:101:10:150:64:1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u4NCP-0001pE-BD for qemu-devel@nongnu.org; Mon, 14 Apr 2025 13:02:23 -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-out1.suse.de (Postfix) with ESMTPS id B090F218A3; Mon, 14 Apr 2025 17:02:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1744650134; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C7HU55HnR2n33HjPq4ymw04FbSfVSN3EDZqOMPyxF6k=; b=nkgZSqA0Ve0fmgiVqeokzq3CT548+0ralV7lTKHCxBpnex+oXvxKhp9bR0AKQMVIyR3mHE 7SMXtTeiy75Pu712Zv1lod12d5yrrCMJe4qJRbm7xeSRcEC6mgO9TRHjV+nvGqPMSRZfLI U1QWD3qLb3Ay1nrI7fJ6UInBef8/57Y= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1744650134; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C7HU55HnR2n33HjPq4ymw04FbSfVSN3EDZqOMPyxF6k=; b=BTiIMZrASTkSm1+pOgVTBZO9H+ZG//yLp4bBZMlSwm265ixJL2wZ3axKAYNVM7TSxoOsSY r86s1Ld957xoDUCQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1744650134; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C7HU55HnR2n33HjPq4ymw04FbSfVSN3EDZqOMPyxF6k=; b=nkgZSqA0Ve0fmgiVqeokzq3CT548+0ralV7lTKHCxBpnex+oXvxKhp9bR0AKQMVIyR3mHE 7SMXtTeiy75Pu712Zv1lod12d5yrrCMJe4qJRbm7xeSRcEC6mgO9TRHjV+nvGqPMSRZfLI U1QWD3qLb3Ay1nrI7fJ6UInBef8/57Y= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1744650134; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C7HU55HnR2n33HjPq4ymw04FbSfVSN3EDZqOMPyxF6k=; b=BTiIMZrASTkSm1+pOgVTBZO9H+ZG//yLp4bBZMlSwm265ixJL2wZ3axKAYNVM7TSxoOsSY r86s1Ld957xoDUCQ== 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 2A0431336F; Mon, 14 Apr 2025 17:02:13 +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 6ZZsNZU//WcmPgAAD6G6ig (envelope-from ); Mon, 14 Apr 2025 17:02:13 +0000 From: Fabiano Rosas To: =?utf-8?Q?Daniel_P=2E_Berrang=C3=A9?= Cc: qemu-devel@nongnu.org, Peter Xu , Markus Armbruster Subject: Re: [RFC PATCH 05/13] migration: Reduce a bit of duplication in migration.json In-Reply-To: References: <20250411191443.22565-1-farosas@suse.de> <20250411191443.22565-6-farosas@suse.de> Date: Mon, 14 Apr 2025 14:02:10 -0300 Message-ID: <87y0w2fzhp.fsf@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-4.30 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-0.992]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; MISSING_XM_UA(0.00)[]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; 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_COUNT_TWO(0.00)[2]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:mid] Received-SPF: pass client-ip=2a07:de40:b251:101:10:150:64:1; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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 Daniel P. Berrang=C3=A9 writes: > On Fri, Apr 11, 2025 at 04:14:35PM -0300, Fabiano Rosas wrote: >> Introduce a new MigrationConfigBase, to allow most of the duplication >> in migration.json to be eliminated. >>=20 >> The reason we need MigrationParameters and MigrationSetParameters is >> that the internal parameter representation in the migration code, as >> well as the user-facing return of query-migrate-parameters use one >> type for the TLS options (tls-creds, tls-hostname, tls-authz), while >> the user-facing input from migrate-set-parameters uses another. >>=20 >> The difference is in whether the NULL values is accepted. The former >> considers NULL as invalid, while the latter doesn't. >>=20 >> Move all other (non-TLS) options into the new type and make it a base >> type for the two diverging types so that each child type can declare >> the TLS options in its own way. >>=20 >> Nothing changes in the user API, nothing changes in the internal >> representation, but we save several lines of duplication in >> migration.json. >>=20 >> Signed-off-by: Fabiano Rosas >> --- >> qapi/migration.json | 358 +++++++++++++------------------------------- >> 1 file changed, 108 insertions(+), 250 deletions(-) >>=20 >> diff --git a/qapi/migration.json b/qapi/migration.json >> index 8b9c53595c..5a4d5a2d3e 100644 >> --- a/qapi/migration.json >> +++ b/qapi/migration.json >> @@ -914,202 +914,6 @@ > >> @@ -1277,45 +1059,121 @@ >> # only has effect if the @mapped-ram capability is enabled. >> # (Since 9.1) >> # >> +# @tls: Whether to use TLS. If this is set the options @tls-authz, >> +# @tls-creds, @tls-hostname are mandatory and a valid string is >> +# expected. (Since 10.1) >> +# > > I'm not really finding it compelling to add a bool @tls as it > is just a denormalization of !!@tls-creds. > This is here by mistake. I remember Markus mentioning that implying TLS usage from tls-creds was undesirable. I was prototyping a way of requiring an explicit opt-in. > Incidentally the docs here are wrong - TLS can be used by > only setting @tls-creds. The @tls-authz & @tls-hostname > params are always optional. > >> # Features: >> # >> # @unstable: Members @x-checkpoint-delay and >> # @x-vcpu-dirty-limit-period are experimental. >> # >> +# Since: 10.1 >> +## >> +{ 'struct': 'MigrationConfigBase', >> + 'data': { '*announce-initial': 'size', >> + '*announce-max': 'size', >> + '*announce-rounds': 'size', >> + '*announce-step': 'size', >> + '*throttle-trigger-threshold': 'uint8', >> + '*cpu-throttle-initial': 'uint8', >> + '*cpu-throttle-increment': 'uint8', >> + '*cpu-throttle-tailslow': 'bool', >> + '*max-bandwidth': 'size', >> + '*avail-switchover-bandwidth': 'size', >> + '*downtime-limit': 'uint64', >> + '*x-checkpoint-delay': { 'type': 'uint32', >> + 'features': [ 'unstable' ] }, >> + '*multifd-channels': 'uint8', >> + '*xbzrle-cache-size': 'size', >> + '*max-postcopy-bandwidth': 'size', >> + '*max-cpu-throttle': 'uint8', >> + '*multifd-compression': 'MultiFDCompression', >> + '*multifd-zlib-level': 'uint8', >> + '*multifd-qatzip-level': 'uint8', >> + '*multifd-zstd-level': 'uint8', >> + '*block-bitmap-mapping': [ 'BitmapMigrationNodeAlias' ], >> + '*x-vcpu-dirty-limit-period': { 'type': 'uint64', >> + 'features': [ 'unstable' ] = }, >> + '*vcpu-dirty-limit': 'uint64', >> + '*mode': 'MigMode', >> + '*zero-page-detection': 'ZeroPageDetection', >> + '*direct-io': 'bool', >> + '*tls': 'bool' } } > > >> { 'struct': 'MigrationParameters', >> + 'base': 'MigrationConfigBase', >> + 'data': { 'tls-creds': 'str', >> + 'tls-hostname': 'str', >> + 'tls-authz': 'str' } } > > snip > >> +{ 'struct': 'MigrateSetParameters', >> + 'base': 'MigrationConfigBase', >> + 'data': { '*tls-creds': 'StrOrNull', >> + '*tls-hostname': 'StrOrNull', >> + '*tls-authz': 'StrOrNull' } } > > I recall we discussed this difference a year or two ago, but can't > recall what the outcome was. > > Making the TLS params optional is a back compatible change for > MigrationParameters. I would think replacing 'str' with 'StrOrNull' > is also back compatible. So I'm wondering if we can't just unify > the sttructs fully for TLS, even if one usage scenario never actually > needs the "OrNull" bit nor needs the optionality=20 > MigrationParameters is the output type for query-migrate-parameters. I belive it must be all non-optional to keep compatibility. The docs on master say: "The optional members aren't really optional" For MigrateSetParameters they've always been optional and continue to be. There we need to keep StrOrNull for compat. > > With regards, > Daniel