From nobody Mon Feb 9 08:28:29 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=1697057251; cv=none; d=zohomail.com; s=zohoarc; b=J2Uh8ngUqvZMckoB0GhuogzUYz2paXPxwLJooJWXpneRLAAX1ADaUUDdJux+/SoOxFPvG/FDBy+DvajKXawJnXmTQR/nwZov3ZH01SbuScXi19JJQstjiTRZixWzDTrfWfr+K+sbme0RwSTT40E1HcEMnIfdscyY+mAsxwKEyG4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697057251; 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=ySPhwgrsUGdd3FlvrWw+iRTKHrAJxtaNBJgcQx6Mkls=; b=Eh+0nurT6VLl3r3ZHtp+nW9ChIw/tRgIFW6eVD1+lUuvCNUtgHF2ZvwY81TK+wxWBa6Q7OpzG8w/ER0vA1+28gh8rMpG3HqCdhA2UMlst/OhDOxJ7bo/JEv4uW8qdpmkih/98L+JqaH7mAXpbdthT3LLBvoC14sIDaao0ERXodE= 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 1697057251826357.0986598346843; Wed, 11 Oct 2023 13:47:31 -0700 (PDT) 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-373-xNVPJy05Pc6cWlw9gLFHWw-1; Wed, 11 Oct 2023 16:47:21 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 3C4C81C07836; Wed, 11 Oct 2023 20:47:19 +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 26F84167F8; Wed, 11 Oct 2023 20:47:19 +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 D2CB91946594; Wed, 11 Oct 2023 20:47:18 +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 065ED1946586 for ; Wed, 11 Oct 2023 20:47:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CE24C40C6CA2; Wed, 11 Oct 2023 20:47:17 +0000 (UTC) Received: from secure.mitica (unknown [10.39.195.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id A009640C6CA0; Wed, 11 Oct 2023 20:47:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697057250; 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=ySPhwgrsUGdd3FlvrWw+iRTKHrAJxtaNBJgcQx6Mkls=; b=VfbcGWJ3IXu9GFguTJ0fJU250te0E1Bo8iPIKHivaraVEdmox5z01gDnJtkLgewRceIwcZ FquVMjpbwn54TM6s92UaJLcso6jjhJv0jrK7DO5bd2qfHvnKhkAoz06gc03qN2pzRdL+Zw Y9evroxM6PAPpmb0i/1Pd5EK1gt7MNU= X-MC-Unique: xNVPJy05Pc6cWlw9gLFHWw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 1/4] migration: migrate 'inc' command option is deprecated. Date: Wed, 11 Oct 2023 22:47:08 +0200 Message-ID: <20231011204711.9744-2-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.5 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: 1697057252173100003 Content-Type: text/plain; charset="utf-8"; x-default="true" 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. =20 +``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. # # @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'. +# # 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'] }, '*detach': 'bool', '*resume': 'bool' } } =20 ## 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 =3D NULL; =20 + if (blk_inc) { + warn_report("-inc migrate option is deprecated, set the " + "'block-incremental' migration parameter 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