From nobody Sun Feb 8 05:20:20 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=1686598441; cv=none; d=zohomail.com; s=zohoarc; b=Qj9+NQ17i2Tjj0y8IrqnpDbTJUQ/ZGokADsTa2gHOD+nw4l4oVuG+GCxBhuaZXk+AefCyLJccwc4hQcIUBX3MKUmMYkXTkHbCLqoAT3rUDnId9A0WpifrrpRi0WNUkZ1Ug5gPh5Ayd0Z5fgKjxZTnH99RtObfmOWas4+jZhE97M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686598441; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eAEuYkGVVoI5bWsaGN5ZaE9+Wu+8W3AgkJEird0C2WM=; b=PQ2pssGSUdtXBnlN7VNusG1uGbNmvppiNuEAcKw2MVOSzw1YuqEVStAYkZFnAbG/lEW36AVc9Sdk2ILLLeFAy0q91WWj0Y7s7khbJP5JKU3dYpzBjC6VhTL2bqY2Lkv/DDyP+75mzaHK1HEd7v+T7CjqZfBCGdgIt6SNSlxAsWI= 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 1686598441832497.9584052932357; Mon, 12 Jun 2023 12:34:01 -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-495-dXQKL4Z2PHme95zuRcm2RQ-1; Mon, 12 Jun 2023 15:33:56 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1625F1019C99; Mon, 12 Jun 2023 19:33:53 +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 43CA240D1B60; Mon, 12 Jun 2023 19:33:52 +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 F420A19459F1; Mon, 12 Jun 2023 19:33:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6B00A1946A47 for ; Mon, 12 Jun 2023 19:33:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 51C62141511A; Mon, 12 Jun 2023 19:33:50 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2DE9F141510A; Mon, 12 Jun 2023 19:33:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686598440; 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=eAEuYkGVVoI5bWsaGN5ZaE9+Wu+8W3AgkJEird0C2WM=; b=ihxlpZKQEawiSmF04vrII00X7ut6PUh/qMPnTZuBXPtNy5Hx/THiueL5yyb3c1b4O0QJQu 3kPLwdqXogUCqwzKgShsYmn/RtzucVMxMG4QizLe+zdhuEjiQeblZdlPc4RcYKNjJzBUri GtTjNRRqwSG9LmZmb/ew8XAwmxD5do0= X-MC-Unique: dXQKL4Z2PHme95zuRcm2RQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Juan Quintela To: qemu-devel@nongnu.org Subject: [RFC 1/6] migration: skipped field is really obsolete. Date: Mon, 12 Jun 2023 21:33:39 +0200 Message-Id: <20230612193344.3796-2-quintela@redhat.com> In-Reply-To: <20230612193344.3796-1-quintela@redhat.com> References: <20230612193344.3796-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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 , 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.2 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: 1686598443912100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Has return zero for more than 10 years. Just mark it deprecated. Signed-off-by: Juan Quintela Reviewed-by: Daniel P. Berrang=C3=A9 --- docs/about/deprecated.rst | 10 ++++++++++ qapi/migration.json | 12 ++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 0743459862..e1aa0eafc8 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -423,3 +423,13 @@ both, older and future versions of QEMU. The ``blacklist`` config file option has been renamed to ``block-rpcs`` (to be in sync with the renaming of the corresponding command line option). + +Migration +--------- + +``skipped`` MigrationStats field (since 8.1) +'''''''''''''''''''''''''''''''''''''''''''' + +``skipped`` field in Migration stats has been deprecated. It hasn't +been used for more than 10 years. + diff --git a/qapi/migration.json b/qapi/migration.json index cb7cd3e578..bcae193733 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -23,7 +23,8 @@ # # @duplicate: number of duplicate (zero) pages (since 1.2) # -# @skipped: number of skipped zero pages (since 1.5) +# @skipped: number of skipped zero pages. Don't use, only provided for +# compatibility (since 1.5) # # @normal: number of normal pages (since 1.2) # @@ -62,11 +63,18 @@ # between 0 and @dirty-sync-count * @multifd-channels. (since # 7.1) # +# Features: +# +# @deprecated: Member @skipped has not been used for a long time. +# # Since: 0.14 +# ## { 'struct': 'MigrationStats', 'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' , - 'duplicate': 'int', 'skipped': 'int', 'normal': 'int', + 'duplicate': 'int', + 'skipped': { 'type': 'int', 'features': ['deprecated'] }, + 'normal': 'int', 'normal-bytes': 'int', 'dirty-pages-rate': 'int', 'mbps': 'number', 'dirty-sync-count': 'int', 'postcopy-requests': 'int', 'page-size': 'int', --=20 2.40.1 From nobody Sun Feb 8 05:20:20 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=1686598443; cv=none; d=zohomail.com; s=zohoarc; b=duHbHQDoeOmZI3hQ7JgyeQnu4VxPoYK/fYo9IwTQ98VDyewo1YqZugJdPf+zLvssPWhfJnoFbT1XnXb2ALbqZUmkvVLTGgkait8Y1q76gARNv2ez+wKtDBCCFzg2eXTtkV2hnNCC1WtdxxNMWV/O9QUftuHMFGHMyys+d+wkjRo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686598443; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8OqWx6y0TTzcv0914vRvVdXqXGubow+mT0rbKrAmzSA=; b=T53ANFg/I6qD24Xelz2ZhVIiWJboQUarulJIaLCqYf1RjWTxRsx4uIcJIteclNoGEcUteDTLORIfsKO1EBlA2/8dGEVN98lPtCB7hEYCTSY34wTegAntbqawwrVSBXYCg0gB0o2cbFyXt3D/EnqQyIyr78R0yUrj/upI3OhjSCY= 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 1686598443757567.5109009860491; Mon, 12 Jun 2023 12:34:03 -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-113-xoOMF-tsNl6QWZA-ZiC6oQ-1; Mon, 12 Jun 2023 15:33:57 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6BBAD101A53B; Mon, 12 Jun 2023 19:33:54 +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 57745492C1B; Mon, 12 Jun 2023 19:33:54 +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 3B8A319465B6; Mon, 12 Jun 2023 19:33:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DDD7A194658C for ; Mon, 12 Jun 2023 19:33:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CF3DE140E952; Mon, 12 Jun 2023 19:33:52 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 989BC141511A; Mon, 12 Jun 2023 19:33:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686598442; 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=8OqWx6y0TTzcv0914vRvVdXqXGubow+mT0rbKrAmzSA=; b=EVIPwquE3iJ397fPTgYuRK5VbvoDwozRng+078GnEZsTM5HQZLFmcN+J0Ijh/AWL56dB/d VcIaaAFOWVSI1V45uTMdnL5IIZYrh1OVHyhfwYssvVz4BSZPrTDDkN1frRZ1QmjEGLl+MP zauGIpIzZVVXFBqxqJA/8cbKFinWI+4= X-MC-Unique: xoOMF-tsNl6QWZA-ZiC6oQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Juan Quintela To: qemu-devel@nongnu.org Subject: [RFC 2/6] migration: migrate 'inc' command option is deprecated. Date: Mon, 12 Jun 2023 21:33:40 +0200 Message-Id: <20230612193344.3796-3-quintela@redhat.com> In-Reply-To: <20230612193344.3796-1-quintela@redhat.com> References: <20230612193344.3796-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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 , 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.10 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: 1686598445865100005 Content-Type: text/plain; charset="utf-8"; x-default="true" 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. =20 +``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``. + 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. # # @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'. +# # 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' } } =20 ## 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 =3D NULL; =20 + if (blk_inc) { + warn_report("-inc migrate option is deprecated, use" + "'migrate_set_parameter block-incremental true' instea= d."); + } + if (resume) { if (s->state !=3D MIGRATION_STATUS_POSTCOPY_PAUSED) { error_setg(errp, "Cannot resume if there is no " --=20 2.40.1 From nobody Sun Feb 8 05:20:20 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=1686598450; cv=none; d=zohomail.com; s=zohoarc; b=b88PJCIvPoP0BWJbMRULW6MWpKi4JiZbDO4mQZ6fgRhAVDJeVif55oFbSVDv9I1I8oHwzjFf2lDMY9kzltLPq6SR733QGsLa+yGZuabktbHHSb2vOTEyhRWwTwlbHzGF/X5LVUH9LLWFMX8OnOR0d751+ndTeSrmadcR4XHnXRc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686598450; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BG+ItxdY/Nq2c8whrRKZhnxHj8iNhZRPeYw1Ilf9V2M=; b=ZSgXJ9aX22XopFXdk+9yAmWc58/mDRUhYWGyccJVgEwbUnlzFwFb7ybcdAVy0XTdyCwFPYexHftE0os9QQIiAuNVyz/vOH4mJ8+mk4NUVp2o3j2tLI8bcUV160pevSj9cDaUcbtjEyYS26HMBsygJ0w8o0BM5I6cKTGSTrIfuxc= 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 16865984494431010.5532915572744; Mon, 12 Jun 2023 12:34:09 -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-361-7USwjuIJP6enZLpfRSz3UA-1; Mon, 12 Jun 2023 15:34:03 -0400 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 7311380120A; Mon, 12 Jun 2023 19:33:56 +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 5D134492CAC; Mon, 12 Jun 2023 19:33:56 +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 34BD519465B6; Mon, 12 Jun 2023 19:33:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6680D194658C for ; Mon, 12 Jun 2023 19:33:55 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4671B141511E; Mon, 12 Jun 2023 19:33:55 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D1AE141511A; Mon, 12 Jun 2023 19:33:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686598446; 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=BG+ItxdY/Nq2c8whrRKZhnxHj8iNhZRPeYw1Ilf9V2M=; b=ED2HfGs2nHW/KVmgN+qldstgbB5aTyeGUWSSXRKli9uoLAjPxeaK1O8XT38pInjxuceFR0 AojANhoHt64tVDeIFwtYR+iccoSq6emYiqJa1B2nrIEG7vlaOr9vX3Nmxib3ch9v1QqCNG tUx7nk0vmOV+YcM7z1bd1ipkUpDRQIE= X-MC-Unique: 7USwjuIJP6enZLpfRSz3UA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Juan Quintela To: qemu-devel@nongnu.org Subject: [RFC 3/6] migration: migrate 'blk' command option is deprecated. Date: Mon, 12 Jun 2023 21:33:41 +0200 Message-Id: <20230612193344.3796-4-quintela@redhat.com> In-Reply-To: <20230612193344.3796-1-quintela@redhat.com> References: <20230612193344.3796-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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 , 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.9 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: 1686598451920100005 Content-Type: text/plain; charset="utf-8"; x-default="true" Use 'migrate_set_capability block true' instead. Signed-off-by: Juan Quintela --- docs/about/deprecated.rst | 7 +++++++ qapi/migration.json | 11 +++++++---- migration/migration.c | 5 +++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index c75a3a8f5a..47e98dc95e 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -440,3 +440,10 @@ The new way to modify migration is using migration par= ameters. ``inc`` functionality can be acchieved using ``migrate_set_parameter block-incremental true``. =20 +``blk`` migrate command option (since 8.1) +'''''''''''''''''''''''''''''''''''''''''' + +The new way to modify migration is using migration parameters. +``blk`` functionality can be acchieved using +``migrate_set_parameter block-incremental true``. + diff --git a/qapi/migration.json b/qapi/migration.json index 4ee28df6da..b71e00737e 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1422,7 +1422,8 @@ # # @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. +# Use 'migrate_set_capability block true' instead. # # @inc: incremental disk copy migration. This option is deprecated. # Use 'migrate_set_parameter block-incremetantal true' instead. @@ -1434,8 +1435,9 @@ # # Features: # -# @deprecated: option @inc is better set with -# 'migrate_set_parameter block-incremental true'. +# @deprecated: options @inc and @blk are better set with +# 'migrate_set_parameter block-incremental true' and +# 'migrate_set_capability block true' respectively. # # Returns: nothing on success # @@ -1458,7 +1460,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 7ebce7c7bf..b7d5f6b96c 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1549,6 +1549,11 @@ static bool migrate_prepare(MigrationState *s, bool = blk, bool blk_inc, "'migrate_set_parameter block-incremental true' instea= d."); } =20 + if (blk) { + warn_report("-blk migrate option is deprecated, use" + "'migrate_set_capability block true' instead."); + } + if (resume) { if (s->state !=3D MIGRATION_STATUS_POSTCOPY_PAUSED) { error_setg(errp, "Cannot resume if there is no " --=20 2.40.1 From nobody Sun Feb 8 05:20:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1686598449; cv=none; d=zohomail.com; s=zohoarc; b=mt9EHG1LeiEk/NQiKnxAf2pOHCFL+F8geWiAYxQQrWuhlXgP66yloee5bvPr76nKUkP6j+GU/XBZt0syXXDvWVdCTP3unR97DekGv6S7n+qFJyGgR97igLwLeGmr3terXVGw8/+BCKmVC6Kq84mfnKg1oJHpZmda9nKWvcWUIKA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686598449; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7uMKnQUFep4KpVWpwsv9At2cXU+pdynUyFLkUCGKq6E=; b=JnU6Ae2JsnwQWJ9cheVjaC2yAdWOXolhgMvGSJoqJ0dliMPLHareCaJgXJRip6SCqBshY0b+0krPwsidJS/yNYeh5Onlog8SPXC/DvDNaK8oTKalsPAecqJcYa52/FC3kE2qYGIkf0WEfAvoopzE6GDk9bYq9LN5xXAZV63Xd7Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1686598449452330.61784775662625; Mon, 12 Jun 2023 12:34:09 -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-562-XqQkxDmBM7mCGiYFiKWhew-1; Mon, 12 Jun 2023 15:34:02 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B740B8030CD; Mon, 12 Jun 2023 19:33:59 +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 9EA211121314; Mon, 12 Jun 2023 19:33:59 +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 6BBBF19465B6; Mon, 12 Jun 2023 19:33:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BDF19194658C for ; Mon, 12 Jun 2023 19:33:57 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AE7781410F01; Mon, 12 Jun 2023 19:33:57 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 889A2141510A; Mon, 12 Jun 2023 19:33:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686598446; 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=7uMKnQUFep4KpVWpwsv9At2cXU+pdynUyFLkUCGKq6E=; b=R6DNtgaoxo5hbTBbGxq6MgVqHt7Y9ezzg+7dIAWpSa9P2EaRZ58WXTRXWTp/hCpnzmZRGg NWELGpdKVcKqVyEm4so7BtLE6Fu2mtLEaQY+UBsOuVMYaBeAfXhIlsAWaZu+k/wYtI0tjV R2HUCpNlXGYZoYMaQjz0VE2h6rQWhcE= X-MC-Unique: XqQkxDmBM7mCGiYFiKWhew-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Juan Quintela To: qemu-devel@nongnu.org Subject: [RFC 4/6] migration: Deprecate -incoming Date: Mon, 12 Jun 2023 21:33:42 +0200 Message-Id: <20230612193344.3796-5-quintela@redhat.com> In-Reply-To: <20230612193344.3796-1-quintela@redhat.com> References: <20230612193344.3796-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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 , 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.3 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: 1686598449954100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Only "defer" is recommended. After setting all migation parameters, start incoming migration with "migrate-incoming uri" command. Signed-off-by: Juan Quintela --- docs/about/deprecated.rst | 7 +++++++ softmmu/vl.c | 2 ++ 2 files changed, 9 insertions(+) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 47e98dc95e..518672722d 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -447,3 +447,10 @@ The new way to modify migration is using migration par= ameters. ``blk`` functionality can be acchieved using ``migrate_set_parameter block-incremental true``. =20 +``-incoming uri`` (since 8.1) +''''''''''''''''''''''''''''' + +Everything except ``-incoming defer`` are deprecated. This allows to +setup parameters before launching the proper migration with +``migrate-incoming uri``. + diff --git a/softmmu/vl.c b/softmmu/vl.c index b0b96f67fa..7fe865ab59 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2651,6 +2651,8 @@ void qmp_x_exit_preconfig(Error **errp) if (incoming) { Error *local_err =3D NULL; if (strcmp(incoming, "defer") !=3D 0) { + warn_report("-incoming %s is deprecated, use -incoming defer a= nd " + " set the uri with migrate-incoming.", incoming); qmp_migrate_incoming(incoming, &local_err); if (local_err) { error_reportf_err(local_err, "-incoming %s: ", incoming); --=20 2.40.1 From nobody Sun Feb 8 05:20:20 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=1686598449; cv=none; d=zohomail.com; s=zohoarc; b=d+hwuwZu43j7pD6tDboe7/dLtJEav2QYHxwHqq7tkG7mVZGnezLeW7qiZmV9BaLA3xJXy4xB0I/8Q8nH2tWzOA014IsOJIwftV6ODcvs0UuNBYOtHRj3lX2chVokWqUe7nCAHopLCX24rcQQv9C2hlpuXCSZq4jGDhBVny3/gYU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686598449; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TsG0ULPROPJHJvum3v/paBKuGm0ocJHoqJw2De/kGRc=; b=V5uKg2DsPc3lssAu9bQycTd/59Fq3A6TPYPs21JVwK91KuQefXe2sqRDCPv2mCHxSBjpAIsZ4M7HIRioEa+YsCQgNjGe4dwMpXJJe8OBsgzPRwdPis8Exw4vvvhIqigBeyzG9HTjhLHRM+tEYyLVHQ/nshXSSac8pdHlp6Ym0MQ= 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 1686598449322294.439004825584; Mon, 12 Jun 2023 12:34:09 -0700 (PDT) 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-537-OduVZWN3OgOersZewwdV5Q-1; Mon, 12 Jun 2023 15:34:05 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E95033C1C4CB; Mon, 12 Jun 2023 19:34:02 +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 D5126C1604C; Mon, 12 Jun 2023 19:34:02 +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 A358219465B6; Mon, 12 Jun 2023 19:34:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CEEF3194658C for ; Mon, 12 Jun 2023 19:34:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AFAAA1415137; Mon, 12 Jun 2023 19:34:00 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id F03E9141511A; Mon, 12 Jun 2023 19:33:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686598448; 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=TsG0ULPROPJHJvum3v/paBKuGm0ocJHoqJw2De/kGRc=; b=XxELU/cltjOWfpIb2s2i9E08Op2quXRSBGaPLi5PYiH0pLOvDycM9ziIKkuGSPrk5wH2N/ vyjZOiHD0MFEEiN/dX4rat1nylp7+QVeP6g7YghgV9aevJbWg1ZQiBAaIg76bYldllZBzv f8pBvtwepGIH2oLyxGptcsGgHumGNoI= X-MC-Unique: OduVZWN3OgOersZewwdV5Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Juan Quintela To: qemu-devel@nongnu.org Subject: [RFC 5/6] migration: Deprecate block migration Date: Mon, 12 Jun 2023 21:33:43 +0200 Message-Id: <20230612193344.3796-6-quintela@redhat.com> In-Reply-To: <20230612193344.3796-1-quintela@redhat.com> References: <20230612193344.3796-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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 , Kevin Wolf , Thomas Huth , qemu-block@nongnu.org, Juan Quintela , libvir-list@redhat.com, Markus Armbruster , Peter Xu , Hanna Czenczek , 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.8 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: 1686598449937100001 Content-Type: text/plain; charset="utf-8"; x-default="true" It is obsolete. It is better to use driver_mirror+NBD instead. CC: Kevin Wolf CC: Eric Blake CC: Stefan Hajnoczi CC: Hanna Czenczek Signed-off-by: Juan Quintela --- Can any of you give one example of how to use driver_mirror+NBD for deprecated.rst? Thanks, Juan. --- docs/about/deprecated.rst | 6 ++++++ qapi/migration.json | 29 +++++++++++++++++++++++++---- migration/block.c | 2 ++ migration/options.c | 7 +++++++ 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 518672722d..173c5ba5cb 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -454,3 +454,9 @@ Everything except ``-incoming defer`` are deprecated. = This allows to setup parameters before launching the proper migration with ``migrate-incoming uri``. =20 +block migration (since 8.1) +''''''''''''''''''''''''''' + +Block migration is too inflexible. It needs to migrate all block +devices or none. Use driver_mirror+NBD instead. + diff --git a/qapi/migration.json b/qapi/migration.json index b71e00737e..a8497de48d 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -258,11 +258,16 @@ # blocked. Present and non-empty when migration is blocked. # (since 6.0) # +# Features: +# +# @deprecated: @disk migration is deprecated. Use driver_mirror+NBD +# instead. +# # Since: 0.14 ## { 'struct': 'MigrationInfo', 'data': {'*status': 'MigrationStatus', '*ram': 'MigrationStats', - '*disk': 'MigrationStats', + '*disk': { 'type': 'MigrationStats', 'features': ['deprecated']= }, '*vfio': 'VfioStats', '*xbzrle-cache': 'XBZRLECacheStats', '*total-time': 'int', @@ -497,6 +502,9 @@ # # Features: # +# @deprecated: @block migration is deprecated. Use driver_mirror+NBD +# instead. +# # @unstable: Members @x-colo and @x-ignore-shared are experimental. # # Since: 1.2 @@ -506,7 +514,8 @@ 'compress', 'events', 'postcopy-ram', { 'name': 'x-colo', 'features': [ 'unstable' ] }, 'release-ram', - 'block', 'return-path', 'pause-before-switchover', 'multifd', + { 'name': 'block', 'features': [ 'deprecated' ] }, + 'return-path', 'pause-before-switchover', 'multifd', 'dirty-bitmaps', 'postcopy-blocktime', 'late-block-activate', { 'name': 'x-ignore-shared', 'features': [ 'unstable' ] }, 'validate-uuid', 'background-snapshot', @@ -789,6 +798,9 @@ # # Features: # +# @deprecated: Member @block-incremental is obsolete. Use +# driver_mirror+NBD instead. +# # @unstable: Member @x-checkpoint-delay is experimental. # # Since: 2.4 @@ -803,7 +815,7 @@ 'tls-creds', 'tls-hostname', 'tls-authz', 'max-bandwidth', 'downtime-limit', { 'name': 'x-checkpoint-delay', 'features': [ 'unstable' ] }, - 'block-incremental', + { 'name': 'block-incremental', 'features': [ 'deprecated' ] }, 'multifd-channels', 'xbzrle-cache-size', 'max-postcopy-bandwidth', 'max-cpu-throttle', 'multifd-compression', @@ -945,6 +957,9 @@ # # Features: # +# @deprecated: Member @block-incremental is obsolete. Use +# driver_mirror+NBD instead. +# # @unstable: Member @x-checkpoint-delay is experimental. # # TODO: either fuse back into MigrationParameters, or make @@ -972,7 +987,8 @@ '*downtime-limit': 'uint64', '*x-checkpoint-delay': { 'type': 'uint32', 'features': [ 'unstable' ] }, - '*block-incremental': 'bool', + '*block-incremental': { 'type': 'bool', + 'features': [ 'deprecated' ] }, '*multifd-channels': 'uint8', '*xbzrle-cache-size': 'size', '*max-postcopy-bandwidth': 'size', @@ -1137,6 +1153,9 @@ # # Features: # +# @deprecated: Member @block-incremental is obsolete. Use +# driver_mirror+NBD instead. +# # @unstable: Member @x-checkpoint-delay is experimental. # # Since: 2.4 @@ -1161,6 +1180,8 @@ '*downtime-limit': 'uint64', '*x-checkpoint-delay': { 'type': 'uint32', 'features': [ 'unstable' ] }, + '*block-incremental': { 'type': 'bool', + 'features': [ 'deprecated' ] }, '*block-incremental': 'bool', '*multifd-channels': 'uint8', '*xbzrle-cache-size': 'size', diff --git a/migration/block.c b/migration/block.c index b9580a6c7e..2521a22269 100644 --- a/migration/block.c +++ b/migration/block.c @@ -722,6 +722,8 @@ static int block_save_setup(QEMUFile *f, void *opaque) trace_migration_block_save("setup", block_mig_state.submitted, block_mig_state.transferred); =20 + warn_report("block migration is deprecated. Use mirror jobs instead."= ); + qemu_mutex_lock_iothread(); ret =3D init_blk_migration(f); if (ret < 0) { diff --git a/migration/options.c b/migration/options.c index b62ab30cd5..374dc0767e 100644 --- a/migration/options.c +++ b/migration/options.c @@ -12,6 +12,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "exec/target_page.h" #include "qapi/clone-visitor.h" #include "qapi/error.h" @@ -437,6 +438,10 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps= , Error **errp) return false; } #endif + if (new_caps[MIGRATION_CAPABILITY_BLOCK]) { + warn_report("Block migration is deprecated. " + "Use driver_mirror+NBD instead."); + } =20 #ifndef CONFIG_REPLICATION if (new_caps[MIGRATION_CAPABILITY_X_COLO]) { @@ -1257,6 +1262,8 @@ static void migrate_params_apply(MigrateSetParameters= *params, Error **errp) } =20 if (params->has_block_incremental) { + warn_report("Block migration is deprecated. " + "Use driver_mirror+NBD instead."); s->parameters.block_incremental =3D params->block_incremental; } if (params->has_multifd_channels) { --=20 2.40.1 From nobody Sun Feb 8 05:20:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1686598451; cv=none; d=zohomail.com; s=zohoarc; b=aum/bEtTrNgqZ+MNbV0ZzVq6iG+hK7p+Df6NlIBD4vPjRKMeSn3A2FciyZlk6Ega6jFcUmsLgjHnmz7dab4CQld/RT2ORiorr9hIcCVkbCSHn5LGu+M1LK716fVOtNSt4esw3Q58yel8qkeHNOVJYTMPdQo2bTrrZ7uarOmPNsA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686598451; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Edt8qqufn7EdAtjp0P3vLZ74RxcAVCHkDZ89VEx6sUU=; b=Z+XhHMqJ+2Lvt+kx+dmSR3OTVTSEIBsLWd08mfVbp6nFj2/fy3Eld6GHnoyXe2tcQui4zYuCJ76RJbelVGDrO8GuB802X8KpTgsRk+XFNlhSJ+onAlqOxSYSrOhLsQRS8WnNdB/M8Xixd6UHphbVkZqgboZsvBeKaf6tCc+sPkY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1686598451911791.4443623274051; Mon, 12 Jun 2023 12:34:11 -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-54-k1jickPaODuNjZbk56f4Ww-1; Mon, 12 Jun 2023 15:34:09 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F203885A5A8; Mon, 12 Jun 2023 19:34:05 +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 A9D7B1415102; Mon, 12 Jun 2023 19:34:05 +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 8C4A719465B6; Mon, 12 Jun 2023 19:34:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9638819465BD for ; Mon, 12 Jun 2023 19:34:03 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 860AF141511F; Mon, 12 Jun 2023 19:34:03 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id F1F7A141511A; Mon, 12 Jun 2023 19:34:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686598450; 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=Edt8qqufn7EdAtjp0P3vLZ74RxcAVCHkDZ89VEx6sUU=; b=cvBIbgUpdzqQtfoRkle8QlMaJZaX4j1rOAdRCZhUlJiqUHNpU8RbR5KYevWXJJnlKgPVMP tQJWSIOgxQSsGtIksNnhNvQw7Jw1B7zc2MDT5Vr7zsF5Vu/E+uNPKbJo24RtVLFJ8TdZ8z Q3gLIIBn1h4+LnzGfyonjBupB4xRDwg= X-MC-Unique: k1jickPaODuNjZbk56f4Ww-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Juan Quintela To: qemu-devel@nongnu.org Subject: [RFC 6/6] migration: Deprecated old compression method Date: Mon, 12 Jun 2023 21:33:44 +0200 Message-Id: <20230612193344.3796-7-quintela@redhat.com> In-Reply-To: <20230612193344.3796-1-quintela@redhat.com> References: <20230612193344.3796-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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 , 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.7 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: 1686598453957100007 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Juan Quintela --- docs/about/deprecated.rst | 8 ++++ qapi/migration.json | 92 ++++++++++++++++++++++++--------------- migration/options.c | 13 ++++++ 3 files changed, 79 insertions(+), 34 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 173c5ba5cb..fe7f2bbde8 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -460,3 +460,11 @@ block migration (since 8.1) Block migration is too inflexible. It needs to migrate all block devices or none. Use driver_mirror+NBD instead. =20 +old compression method (since 8.1) +'''''''''''''''''''''''''''''''''' + +Compression method fails too much. Too many races. We are going to +remove it if nobody fixes it. For starters, migration-test +compression tests are disabled becase they hand randomly. If you need +compression, use multifd compression methods. + diff --git a/qapi/migration.json b/qapi/migration.json index a8497de48d..40a8b5d124 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -244,6 +244,7 @@ # # @compression: migration compression statistics, only returned if # compression feature is on and status is 'active' or 'completed' +# It is obsolete and deprecated. Use multifd compression methods. # (Since 3.1) # # @socket-address: Only used for tcp, to know what the real port is @@ -261,7 +262,8 @@ # Features: # # @deprecated: @disk migration is deprecated. Use driver_mirror+NBD -# instead. +# instead. @compression is obsolete use multifd compression +# methods instead. # # Since: 0.14 ## @@ -279,7 +281,7 @@ '*blocked-reasons': ['str'], '*postcopy-blocktime': 'uint32', '*postcopy-vcpu-blocktime': ['uint32'], - '*compression': 'CompressionStats', + '*compression': { 'type': 'CompressionStats', 'features': ['dep= recated'] }, '*socket-address': ['SocketAddress'] } } =20 ## @@ -432,7 +434,8 @@ # compress and xbzrle are both on, compress only takes effect in # the ram bulk stage, after that, it will be disabled and only # xbzrle takes effect, this can help to minimize migration -# traffic. The feature is disabled by default. (since 2.4 ) +# traffic. The feature is disabled by default. Obsolete. Use +# multifd compression methods if needed. (since 2.4 ) # # @events: generate events for each migration state change (since 2.4 # ) @@ -503,6 +506,7 @@ # Features: # # @deprecated: @block migration is deprecated. Use driver_mirror+NBD +# instead. @compress is obsolete use multifd compression methods # instead. # # @unstable: Members @x-colo and @x-ignore-shared are experimental. @@ -511,7 +515,8 @@ ## { 'enum': 'MigrationCapability', 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks', - 'compress', 'events', 'postcopy-ram', + { 'name': 'compress', 'features': [ 'deprecated' ] }, + 'events', 'postcopy-ram', { 'name': 'x-colo', 'features': [ 'unstable' ] }, 'release-ram', { 'name': 'block', 'features': [ 'deprecated' ] }, @@ -671,22 +676,24 @@ # migration, the compression level is an integer between 0 and 9, # where 0 means no compression, 1 means the best compression # speed, and 9 means best compression ratio which will consume -# more CPU. +# more CPU. Obsolete, see multifd compression if needed. # # @compress-threads: Set compression thread count to be used in live # migration, the compression thread count is an integer between 1 -# and 255. +# and 255. Obsolete, see multifd compression if needed. # # @compress-wait-thread: Controls behavior when all compression # threads are currently busy. If true (default), wait for a free # compression thread to become available; otherwise, send the page -# uncompressed. (Since 3.1) +# uncompressed. Obsolete, see multifd compression if +# needed. (Since 3.1) # # @decompress-threads: Set decompression thread count to be used in # live migration, the decompression thread count is an integer # between 1 and 255. Usually, decompression is at least 4 times as # fast as compression, so set the decompress-threads to the number -# about 1/4 of compress-threads is adequate. +# about 1/4 of compress-threads is adequate. Obsolete, see multifd +# compression if needed. # # @throttle-trigger-threshold: The ratio of bytes_dirty_period and # bytes_xfer_period to trigger throttling. It is expressed as @@ -799,7 +806,9 @@ # Features: # # @deprecated: Member @block-incremental is obsolete. Use -# driver_mirror+NBD instead. +# driver_mirror+NBD instead. Compression is obsolete, so members +# @compress-level, @compress-threads, @decompress-threads and +# @compress-wait-thread should not be used. # # @unstable: Member @x-checkpoint-delay is experimental. # @@ -808,8 +817,11 @@ { 'enum': 'MigrationParameter', 'data': ['announce-initial', 'announce-max', 'announce-rounds', 'announce-step', - 'compress-level', 'compress-threads', 'decompress-threads', - 'compress-wait-thread', 'throttle-trigger-threshold', + { 'name': 'compress-level', 'features': [ 'deprecated' ] }, + { 'name': 'compress-threads', 'features': [ 'deprecated' ] }, + { 'name': 'decompress-threads', 'features': [ 'deprecated' ] }, + { 'name': 'compress-wait-thread', 'features': [ 'deprecated' ] = }, + 'throttle-trigger-threshold', 'cpu-throttle-initial', 'cpu-throttle-increment', 'cpu-throttle-tailslow', 'tls-creds', 'tls-hostname', 'tls-authz', 'max-bandwidth', @@ -837,16 +849,17 @@ # @announce-step: Increase in delay (in milliseconds) between # subsequent packets in the announcement (Since 4.0) # -# @compress-level: compression level +# @compress-level: compression level. Obsolete and deprecated. # -# @compress-threads: compression thread count +# @compress-threads: compression thread count. Obsolete and deprecated. # # @compress-wait-thread: Controls behavior when all compression # threads are currently busy. If true (default), wait for a free # compression thread to become available; otherwise, send the page -# uncompressed. (Since 3.1) +# uncompressed. Obsolete and deprecated. (Since 3.1) # -# @decompress-threads: decompression thread count +# @decompress-threads: decompression thread count. Obsolete and +# deprecated. # # @throttle-trigger-threshold: The ratio of bytes_dirty_period and # bytes_xfer_period to trigger throttling. It is expressed as @@ -958,7 +971,9 @@ # Features: # # @deprecated: Member @block-incremental is obsolete. Use -# driver_mirror+NBD instead. +# driver_mirror+NBD instead. Compression is obsolete, so members +# @compress-level, @compress-threads, @decompress-threads and +# @compress-wait-thread should not be used. # # @unstable: Member @x-checkpoint-delay is experimental. # @@ -972,10 +987,14 @@ '*announce-max': 'size', '*announce-rounds': 'size', '*announce-step': 'size', - '*compress-level': 'uint8', - '*compress-threads': 'uint8', - '*compress-wait-thread': 'bool', - '*decompress-threads': 'uint8', + '*compress-level': { 'type': 'uint8', + 'features': [ 'deprecated' ] }, + '*compress-threads': { 'type': 'uint8', + 'features': [ 'deprecated' ] }, + '*compress-wait-thread': { 'type': 'bool', + 'features': [ 'deprecated' ] }, + '*decompress-threads': { 'type': 'uint8', + 'features': [ 'deprecated' ] }, '*throttle-trigger-threshold': 'uint8', '*cpu-throttle-initial': 'uint8', '*cpu-throttle-increment': 'uint8', @@ -1008,7 +1027,7 @@ # Example: # # -> { "execute": "migrate-set-parameters" , -# "arguments": { "compress-level": 1 } } +# "arguments": { "multifd-channels": 5 } } # <- { "return": {} } ## { 'command': 'migrate-set-parameters', 'boxed': true, @@ -1031,16 +1050,18 @@ # @announce-step: Increase in delay (in milliseconds) between # subsequent packets in the announcement (Since 4.0) # -# @compress-level: compression level +# @compress-level: compression level. Obsolete and deprecated. # -# @compress-threads: compression thread count +# @compress-threads: compression thread count. Obsolote and +# deprecated. # # @compress-wait-thread: Controls behavior when all compression # threads are currently busy. If true (default), wait for a free # compression thread to become available; otherwise, send the page -# uncompressed. (Since 3.1) +# uncompressed. Obsolete and deprecated. (Since 3.1) # -# @decompress-threads: decompression thread count +# @decompress-threads: decompression thread count. Obsolete and +# deprecated. # # @throttle-trigger-threshold: The ratio of bytes_dirty_period and # bytes_xfer_period to trigger throttling. It is expressed as @@ -1154,7 +1175,9 @@ # Features: # # @deprecated: Member @block-incremental is obsolete. Use -# driver_mirror+NBD instead. +# driver_mirror+NBD instead. Compression is obsolete, so members +# @compress-level, @compress-threads, @decompress-threads and +# @compress-wait-thread should not be used. # # @unstable: Member @x-checkpoint-delay is experimental. # @@ -1165,10 +1188,14 @@ '*announce-max': 'size', '*announce-rounds': 'size', '*announce-step': 'size', - '*compress-level': 'uint8', - '*compress-threads': 'uint8', - '*compress-wait-thread': 'bool', - '*decompress-threads': 'uint8', + '*compress-level': { 'type': 'uint8', + 'features': [ 'deprecated' ] }, + '*compress-threads': { 'type': 'uint8', + 'features': [ 'deprecated' ] }, + '*compress-wait-thread': { 'type': 'bool', + 'features': [ 'deprecated' ] }, + '*decompress-threads': { 'type': 'uint8', + 'features': [ 'deprecated' ] }, '*throttle-trigger-threshold': 'uint8', '*cpu-throttle-initial': 'uint8', '*cpu-throttle-increment': 'uint8', @@ -1182,7 +1209,6 @@ 'features': [ 'unstable' ] }, '*block-incremental': { 'type': 'bool', 'features': [ 'deprecated' ] }, - '*block-incremental': 'bool', '*multifd-channels': 'uint8', '*xbzrle-cache-size': 'size', '*max-postcopy-bandwidth': 'size', @@ -1205,10 +1231,8 @@ # # -> { "execute": "query-migrate-parameters" } # <- { "return": { -# "decompress-threads": 2, +# "multifd-channels": 2, # "cpu-throttle-increment": 10, -# "compress-threads": 8, -# "compress-level": 1, # "cpu-throttle-initial": 20, # "max-bandwidth": 33554432, # "downtime-limit": 300 diff --git a/migration/options.c b/migration/options.c index 374dc0767e..c04e62ba2d 100644 --- a/migration/options.c +++ b/migration/options.c @@ -443,6 +443,11 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps= , Error **errp) "Use driver_mirror+NBD instead."); } =20 + if (new_caps[MIGRATION_CAPABILITY_BLOCK]) { + warn_report("Old compression method is deprecated. " + "Use multifd compression methods instead."); + } + #ifndef CONFIG_REPLICATION if (new_caps[MIGRATION_CAPABILITY_X_COLO]) { error_setg(errp, "QEMU compiled without replication module" @@ -1196,18 +1201,26 @@ static void migrate_params_apply(MigrateSetParamete= rs *params, Error **errp) /* TODO use QAPI_CLONE() instead of duplicating it inline */ =20 if (params->has_compress_level) { + warn_report("Old compression is deprecated. " + "Use multifd compression methods instead."); s->parameters.compress_level =3D params->compress_level; } =20 if (params->has_compress_threads) { + warn_report("Old compression is deprecated. " + "Use multifd compression methods instead."); s->parameters.compress_threads =3D params->compress_threads; } =20 if (params->has_compress_wait_thread) { + warn_report("Old compression is deprecated. " + "Use multifd compression methods instead."); s->parameters.compress_wait_thread =3D params->compress_wait_threa= d; } =20 if (params->has_decompress_threads) { + warn_report("Old compression is deprecated. " + "Use multifd compression methods instead."); s->parameters.decompress_threads =3D params->decompress_threads; } =20 --=20 2.40.1