From nobody Mon Feb 9 11:28:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697057284; cv=none; d=zohomail.com; s=zohoarc; b=KJLZhZUXFz7wcIai3p1W8UrTtQYTTaMh0bHFZ0XQFM5/ZFhUV7BZWvxvVM8R5bWP1hHX6FNaiOrLrEdsy83zv3XyQmn5vHa4kwtlub0ns42KAnHQ9dIy5xUQZGIiXEjV0T7y2VKHoLgthu+UwaCNW44Eswpv0H6TeJH7QSrqs5w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697057284; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gU5GxAarevf/Fiw4KDpWZonSphVZ+x/f+SBLgawLGwk=; b=Ef0P6cqWpH3GoWKM9h6BRUmh1wxyaNRDdG7dhBDkPFIN/MDIhbypXXVV2cJ6fJ/+z2DJ4BlLbAgjHb6iDMi3ttf0dKfoJK0UOXUZ3ygLgGJTfcjN3ilksG3WWpNmBYEacCKouFj9eu4Z1bm1QDhO5HJhdfybb8KK3TRFvu8j5B0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1697057284077762.8605011121077; Wed, 11 Oct 2023 13:48:04 -0700 (PDT) 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-652-EKFngL8bPpOaPBu__qifcQ-1; Wed, 11 Oct 2023 16:47:24 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 45C9A811E92; Wed, 11 Oct 2023 20:47:22 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 32E8A21CAC6B; Wed, 11 Oct 2023 20:47:22 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 162B31946594; Wed, 11 Oct 2023 20:47:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5DD801946586 for ; Wed, 11 Oct 2023 20:47:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4B11140C6CA1; Wed, 11 Oct 2023 20:47:20 +0000 (UTC) Received: from secure.mitica (unknown [10.39.195.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1CF4940C6CA0; Wed, 11 Oct 2023 20:47:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697057283; h=from:from:sender:sender:reply-to:subject:subject: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=gU5GxAarevf/Fiw4KDpWZonSphVZ+x/f+SBLgawLGwk=; b=cYurXXlqQEoe02PaVvs+u8sJL1oyEDJOD34iTNOqGYe0YAeEOJEx5yOaAYGFp+AU5dwDY8 6oOAllalL3e/+upgNAVJcxeFfGV2ztKA56DcWZCHvBGqHMVLY/7ILpeI8IIrsEL4US+1aW qZAx03LqQPwH8gA5Oo2bzMvqaejNKkg= X-MC-Unique: EKFngL8bPpOaPBu__qifcQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 2/4] migration: migrate 'blk' command option is deprecated. Date: Wed, 11 Oct 2023 22:47:09 +0200 Message-ID: <20231011204711.9744-3-quintela@redhat.com> In-Reply-To: <20231011204711.9744-1-quintela@redhat.com> References: <20231011204711.9744-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , Fabiano Rosas , qemu-block@nongnu.org, Juan Quintela , libvir-list@redhat.com, Markus Armbruster , Peter Xu , Leonardo Bras , Stefan Hajnoczi , Paolo Bonzini , Eric Blake Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1697057284282100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Set the 'block' migration capability to 'true' instead. Signed-off-by: Juan Quintela Reviewed-by: Thomas Huth --- docs/about/deprecated.rst | 7 +++++++ qapi/migration.json | 10 +++++++--- migration/migration.c | 5 +++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index eb0f326f00..b2b7e11742 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -424,3 +424,10 @@ The new way to modify migration is using migration par= ameters. ``inc`` functionality can be achieved by setting the ``block-incremental`` migration parameter to ``true``. =20 +``blk`` migrate command option (since 8.2) +'''''''''''''''''''''''''''''''''''''''''' + +The new way to modify migration is using migration parameters. +``blk`` functionality can be achieved by setting the +``block`` migration capability to ``true``. + diff --git a/qapi/migration.json b/qapi/migration.json index 7669c98c7a..e4949e0d8e 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1484,7 +1484,9 @@ # # @uri: the Uniform Resource Identifier of the destination VM # -# @blk: do block migration (full disk copy) +# @blk: do block migration (full disk copy). This option is +# deprecated. Set the 'block' migration capability to 'true' +# instead. # # @inc: incremental disk copy migration. This option is deprecated. # Set the 'block-incremetantal' migration parameter to 'true' @@ -1498,7 +1500,8 @@ # Features: # # @deprecated: option @inc should be enabled by setting the -# 'block-incremental' migration parameter to 'true'. +# 'block-incremental' migration parameter to 'true', option @blk +# should be enabled by setting the 'block' capability to 'true'. # # Returns: nothing on success # @@ -1521,7 +1524,8 @@ # <- { "return": {} } ## { 'command': 'migrate', - 'data': {'uri': 'str', '*blk': 'bool', + 'data': {'uri': 'str', + '*blk': { 'type': 'bool', 'features': ['deprecated'] }, '*inc': { 'type': 'bool', 'features': ['deprecated'] }, '*detach': 'bool', '*resume': 'bool' } } =20 diff --git a/migration/migration.c b/migration/migration.c index c7e4c37b8a..dbe33bfd37 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1607,6 +1607,11 @@ static bool migrate_prepare(MigrationState *s, bool = blk, bool blk_inc, " instead."); } =20 + if (blk) { + warn_report("-blk migrate option is deprecated, set the " + "'block' capability to 'true' instead."); + } + if (resume) { if (s->state !=3D MIGRATION_STATUS_POSTCOPY_PAUSED) { error_setg(errp, "Cannot resume if there is no " --=20 2.41.0