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 C2CCECDB46E for ; Thu, 12 Oct 2023 09:52:32 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qqsMe-000515-SZ; Thu, 12 Oct 2023 05:52:20 -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 1qqsMd-00050d-Ei for qemu-devel@nongnu.org; Thu, 12 Oct 2023 05:52:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qqsMa-00037p-4C for qemu-devel@nongnu.org; Thu, 12 Oct 2023 05:52:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697104333; h=from:from:reply-to:subject:subject: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=ABiEZjFb1KdXuK41H2kJkl+RrHrZixvVvuib+qFYlkk=; b=ZUUb4op2wlPkvLXtPtVup01jSPydV1nenZ2C5QejlSRbmSh7iOmn9w7n+2dwuXWpoHSIlw 7M11HFEMnmRYO9XBGtX05AyBevnG7lr6YJDm3fmNYWjsmpW/OB8JBKi5wO2Mpr02r8uctB kT5O+dv/ADUPDFTQagteCl8ahabdXaY= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-661-BUHHNonePSGXHZ9ROXecuQ-1; Thu, 12 Oct 2023 05:52:10 -0400 X-MC-Unique: BUHHNonePSGXHZ9ROXecuQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AE9693C14AAB; Thu, 12 Oct 2023 09:52:09 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.72]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8C8A840C6CA0; Thu, 12 Oct 2023 09:52:09 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 7B9AB21E6A1F; Thu, 12 Oct 2023 11:52:08 +0200 (CEST) From: Markus Armbruster To: Juan Quintela Cc: qemu-devel@nongnu.org, Fam Zheng , Eric Blake , libvir-list@redhat.com, Leonardo Bras , Daniel P . =?utf-8?Q?Berrang=C3=A9?= , Stefan Hajnoczi , Paolo Bonzini , Fabiano Rosas , Peter Xu , qemu-block@nongnu.org, Thomas Huth Subject: Re: [PATCH v3 1/4] migration: migrate 'inc' command option is deprecated. References: <20231011204711.9744-1-quintela@redhat.com> <20231011204711.9744-2-quintela@redhat.com> Date: Thu, 12 Oct 2023 11:52:08 +0200 In-Reply-To: <20231011204711.9744-2-quintela@redhat.com> (Juan Quintela's message of "Wed, 11 Oct 2023 22:47:08 +0200") Message-ID: <87zg0oyxpz.fsf@pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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 Juan Quintela writes: > Set the 'block_incremental' migration parameter to 'true' instead. > > Reviewed-by: Thomas Huth > Signed-off-by: Juan Quintela > --- > docs/about/deprecated.rst | 7 +++++++ > qapi/migration.json | 12 ++++++++++-- > migration/migration.c | 6 ++++++ > 3 files changed, 23 insertions(+), 2 deletions(-) > > diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst > index 8b136320e2..eb0f326f00 100644 > --- a/docs/about/deprecated.rst > +++ b/docs/about/deprecated.rst > @@ -417,3 +417,10 @@ Migration > ``skipped`` field in Migration stats has been deprecated. It hasn't > been used for more than 10 years. > > +``inc`` migrate command option (since 8.2) > +'''''''''''''''''''''''''''''''''''''''''' > + > +The new way to modify migration is using migration parameters. > +``inc`` functionality can be achieved by setting the > +``block-incremental`` migration parameter to ``true``. > + > diff --git a/qapi/migration.json b/qapi/migration.json > index d7dfaa5db9..7669c98c7a 100644 > --- a/qapi/migration.json > +++ b/qapi/migration.json > @@ -1486,13 +1486,20 @@ > # > # @blk: do block migration (full disk copy) > # > -# @inc: incremental disk copy migration > +# @inc: incremental disk copy migration. This option is deprecated. > +# Set the 'block-incremetantal' migration parameter to 'true' > +# instead. 'block-incremental' > # > # @detach: this argument exists only for compatibility reasons and is > # ignored by QEMU > # > # @resume: resume one paused migration, default "off". (since 3.0) > # > +# Features: > +# > +# @deprecated: option @inc should be enabled by setting the > +# 'block-incremental' migration parameter to 'true'. > +# You add deprecation notices, one to the member documentation, and one to the "Features:" section. You should add just one, to the "Features:" section. Suggest: # @deprecated: Member @inc is deprecated. Use migration parameter # @block-incremental instead. > # Returns: nothing on success > # > # Since: 0.14 > @@ -1514,7 +1521,8 @@ > # <- { "return": {} } > ## > { 'command': 'migrate', > - 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', > + 'data': {'uri': 'str', '*blk': 'bool', > + '*inc': { 'type': 'bool', 'features': ['deprecated'] }, For better or worse, we format like [ 'deprecated' ]. > '*detach': 'bool', '*resume': 'bool' } } > > ## > diff --git a/migration/migration.c b/migration/migration.c > index 1c6c81ad49..c7e4c37b8a 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -1601,6 +1601,12 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc, > { > Error *local_err = NULL; > > + if (blk_inc) { > + warn_report("-inc migrate option is deprecated, set the " > + "'block-incremental' migration parameter to 'true'" > + " instead."); There is no "-inc migrate option". You're refering to QMP command migrate's parameter @inc / HMP command migrate's flag -i. > + } > + > if (resume) { > if (s->state != MIGRATION_STATUS_POSTCOPY_PAUSED) { > error_setg(errp, "Cannot resume if there is no " As far as I can see, HMP command migrate still uses the deprecated interface: qmp_migrate(uri, !!blk, blk, !!inc, inc, false, false, true, resume, &err); Its use should be replaced before we deprecate it.