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 47262EB64D7 for ; Tue, 20 Jun 2023 12:06:22 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBa7M-0003kQ-TH; Tue, 20 Jun 2023 08:05:53 -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 1qBa7J-0003jp-9K for qemu-devel@nongnu.org; Tue, 20 Jun 2023 08:05:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qBa7H-0001C8-IF for qemu-devel@nongnu.org; Tue, 20 Jun 2023 08:05:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687262746; h=from:from:reply-to: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=b96faor2Mo7gDFE9hCDWXlqsvWK7L/QmHC8lZm2UJqc=; b=Uqp59XRuLKUAFM2AeLCpPm1G8wizyYKARv5ssS9K+oeZZQQo4fHBLnSAJjAnuMnuBclj5L 9PHqRknu0BBNRDQXYcGYzGjOvGKo/zM+Wa+VYDZEz66tsRWYvqMtHh2J8vEdBzm1Cri79Z hOus54IrlQepC/FGg7ca2CSqvZNLVdc= Received: from mimecast-mx02.redhat.com (mx3-rdu2.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-626-ngssLtrQOl-DuJYRlZFR5w-1; Tue, 20 Jun 2023 08:05:43 -0400 X-MC-Unique: ngssLtrQOl-DuJYRlZFR5w-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 106B838294BA; Tue, 20 Jun 2023 12:05:42 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 948BE492B01; Tue, 20 Jun 2023 12:05:40 +0000 (UTC) Date: Tue, 20 Jun 2023 13:05:38 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Juan Quintela Cc: qemu-devel@nongnu.org, Markus Armbruster , Leonardo Bras , qemu-block@nongnu.org, Peter Xu , Stefan Hajnoczi , Eric Blake , Fam Zheng , Thomas Huth , libvir-list@redhat.com, Paolo Bonzini Subject: Re: [RFC 2/6] migration: migrate 'inc' command option is deprecated. Message-ID: References: <20230612193344.3796-1-quintela@redhat.com> <20230612193344.3796-3-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230612193344.3796-3-quintela@redhat.com> User-Agent: Mutt/2.2.9 (2022-11-12) X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Mon, Jun 12, 2023 at 09:33:40PM +0200, Juan Quintela wrote: > Use 'migrate_set_parameter block_incremental true' instead. > > Signed-off-by: Juan Quintela > --- > docs/about/deprecated.rst | 7 +++++++ > qapi/migration.json | 11 +++++++++-- > migration/migration.c | 5 +++++ > 3 files changed, 21 insertions(+), 2 deletions(-) > > diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst > index e1aa0eafc8..c75a3a8f5a 100644 > --- a/docs/about/deprecated.rst > +++ b/docs/about/deprecated.rst > @@ -433,3 +433,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.1) > +'''''''''''''''''''''''''''''''''''''''''' > + > +The new way to modify migration is using migration parameters. > +``inc`` functionality can be acchieved using > +``migrate_set_parameter block-incremental true``. This is a HMP command, but the change affects QMP too. I'd suggest ``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 bcae193733..4ee28df6da 100644 > --- a/qapi/migration.json > +++ b/qapi/migration.json > @@ -1424,13 +1424,19 @@ > # > # @blk: do block migration (full disk copy) > # > -# @inc: incremental disk copy migration > +# @inc: incremental disk copy migration. This option is deprecated. > +# Use 'migrate_set_parameter block-incremetantal true' instead. @inc: incremental disk copy migration. This option is deprecated. Set the 'block-incremetantal' migration parameter to 'true' instead. > # > # @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 is better set with > +# 'migrate_set_parameter block-incremental true'. # @deprecated: option @inc should be enabled by # setting the 'block-incremental' migration parameter to 'true'. > +# > # Returns: nothing on success > # > # Since: 0.14 > @@ -1452,7 +1458,8 @@ > # <- { "return": {} } > ## > { 'command': 'migrate', > - 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', > + 'data': {'uri': 'str', '*blk': 'bool', > + '*inc': { 'type': 'bool', 'features': ['deprecated'] }, > '*detach': 'bool', '*resume': 'bool' } } > > ## > diff --git a/migration/migration.c b/migration/migration.c > index dc05c6f6ea..7ebce7c7bf 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -1544,6 +1544,11 @@ 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, use" > + "'migrate_set_parameter block-incremental true' instead."); warn_report("-inc migrate option is deprecated, set the" "'block-incremental' migration parameter to 'true' instead."); With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|