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 72DFACDB47E for ; Wed, 18 Oct 2023 06:54:35 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt0Rh-00087p-8l; Wed, 18 Oct 2023 02:54:21 -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 1qt0Rc-000871-V8 for qemu-devel@nongnu.org; Wed, 18 Oct 2023 02:54:16 -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 1qt0Rb-0004PJ-E8 for qemu-devel@nongnu.org; Wed, 18 Oct 2023 02:54:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697612054; 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=PoFioH4734qXHH+InawgHw05CWm6OJhkGV6N0AFZ85g=; b=c6AQORCEBdMJx+xnkxh8ziR+uPcC25aeAMmIGnpsH3z6NC88XXbTyTwgvzBSKPpMKwni4u 4g8sh8k7bbb0tLRd/L9bdhJhGewHFncnLS/y0jFkeXbuXLevvKCNmD5CYPmmK51ryxda2O qwuKKOYYotCVFKuEvDZfkx3q8hrtxKg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-670-gSA7WbR4NHmI283rtizNNA-1; Wed, 18 Oct 2023 02:54:13 -0400 X-MC-Unique: gSA7WbR4NHmI283rtizNNA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 11EDA88CC40; Wed, 18 Oct 2023 06:54:13 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.56]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C8E4F492BFA; Wed, 18 Oct 2023 06:54:12 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B740121E6A1F; Wed, 18 Oct 2023 08:54:11 +0200 (CEST) From: Markus Armbruster To: Juan Quintela Cc: Markus Armbruster , qemu-devel@nongnu.org, libvir-list@redhat.com, Leonardo Bras , Peter Xu , Fam Zheng , Stefan Hajnoczi , Eric Blake , qemu-block@nongnu.org, Fabiano Rosas , Thomas Huth Subject: Re: [PATCH v5 2/7] migration: migrate 'inc' command option is deprecated. References: <20231017115238.18309-1-quintela@redhat.com> <20231017115238.18309-3-quintela@redhat.com> <87zg0h5pbh.fsf@pond.sub.org> <87lec1z33t.fsf@secure.mitica> Date: Wed, 18 Oct 2023 08:54:11 +0200 In-Reply-To: <87lec1z33t.fsf@secure.mitica> (Juan Quintela's message of "Tue, 17 Oct 2023 17:21:42 +0200") Message-ID: <87r0lsxvxo.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.10 Received-SPF: pass client-ip=170.10.133.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_H3=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: > Markus Armbruster wrote: >> Juan Quintela writes: >> >>> Use blockdev-mirror with NBD instead. >>> >>> Reviewed-by: Thomas Huth >>> Acked-by: Stefan Hajnoczi >>> Signed-off-by: Juan Quintela >>> >>> --- >>> >>> Improve documentation and style (thanks Markus) >>> --- >>> docs/about/deprecated.rst | 8 ++++++++ >>> qapi/migration.json | 8 +++++++- >>> migration/migration-hmp-cmds.c | 5 +++++ >>> migration/migration.c | 5 +++++ >>> 4 files changed, 25 insertions(+), 1 deletion(-) >>> >>> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst >>> index 2febd2d12f..fc6adf1dea 100644 >>> --- a/docs/about/deprecated.rst >>> +++ b/docs/about/deprecated.rst >>> @@ -461,3 +461,11 @@ 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) >>> +'''''''''''''''''''''''''''''''''''''''''' >>> + >>> +Use blockdev-mirror with NBD instead. >>> + >>> +As an intermediate step the ``inc`` functionality can be achieved by >>> +setting the ``block-incremental`` migration parameter to ``true``. >>> +But this parameter is also deprecated. >>> diff --git a/qapi/migration.json b/qapi/migration.json >>> index db3df12d6c..fa7f4f2575 100644 >>> --- a/qapi/migration.json >>> +++ b/qapi/migration.json >>> @@ -1524,6 +1524,11 @@ >>> # >>> # @resume: resume one paused migration, default "off". (since 3.0) >>> # >>> +# Features: >>> +# >>> +# @deprecated: Member @inc is deprecated. Use blockdev-mirror with >>> +# NBD instead. >>> +# >>> # Returns: nothing on success >>> # >>> # Since: 0.14 >>> @@ -1545,7 +1550,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-hmp-cmds.c b/migration/migration-hmp-cmds.c >>> index a82597f18e..fee7079afa 100644 >>> --- a/migration/migration-hmp-cmds.c >>> +++ b/migration/migration-hmp-cmds.c >>> @@ -745,6 +745,11 @@ void hmp_migrate(Monitor *mon, const QDict *qdict) >>> const char *uri = qdict_get_str(qdict, "uri"); >>> Error *err = NULL; >>> >>> + if (inc) { >>> + warn_report("option '-i' is deprecated. Use 'blockdev-mirror + NBD'" >>> + " instead."); >> >> Convention: an error or warning message is a single phrase, with no >> newline or trailing punctuation. The simplest way to conform to it is >> something like >> >> warn_report("option '-i' is deprecated;" >> " use blockdev-mirror with NBD instead."); > > then the trailing dot is not needed, right? No! Comical screwup on my part %-} >>> + } >>> + >>> qmp_migrate(uri, !!blk, blk, !!inc, inc, >>> false, false, true, resume, &err); >>> if (hmp_handle_error(mon, err)) { >>> diff --git a/migration/migration.c b/migration/migration.c >>> index 6ba5e145ac..b8b3ba58df 100644 >>> --- a/migration/migration.c >>> +++ b/migration/migration.c >>> @@ -1603,6 +1603,11 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc, >>> { >>> Error *local_err = NULL; >>> >>> + if (blk_inc) { >>> + warn_report("parameter 'inc' is deprecated. Use blockdev-mirror with" >>> + " NBD instead"); >> >> Likewise. >> >>> + } >>> + >>> if (resume) { >>> if (s->state != MIGRATION_STATUS_POSTCOPY_PAUSED) { >>> error_setg(errp, "Cannot resume if there is no " >> >> Other than that >> Reviewed-by: Markus Armbruster > > OK, fixing it. Thanks!