From nobody Tue May 7 19:03:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570058769; cv=none; d=zoho.com; s=zohoarc; b=PplKEE8m369+qFdw5Z3DxCSNGkgLYMTl0N1QrWepYKCKlqvhiaBSs728HqJNGUUlwfoKYQVM9U6Z5Is3MItCZdk0g9hSh7w62WfjQZgPm5cCJEp8zJF/bvZ4t3dwUTksXXAuxsdBMyLLK1PJkWsH19ObQAUGIJRo7h0jgnuRfMM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570058769; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=09U/2vbUs6X+rMvPquYX8TxBqN5IRuG31DK1DeCOCwA=; b=DcI0f6Mf7j+6/m+cxcg8lZ8BU+cbUaXCoFRktkdf8ybB0EDoph1hyqlgMtKzV414R8A3FkuDtJ/vWK2ZrOAqB3wfS69m4/qPkeFp/W4ypWzbLTGQJZ69R2wwk9URY+PPRLYnd0mjJTzQ4POHmxoN3vC9Tw88vyYthuzRQ870vho= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570058769255373.73914289102515; Wed, 2 Oct 2019 16:26:09 -0700 (PDT) Received: from localhost ([::1]:59884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFo0W-00066w-6T for importer@patchew.org; Wed, 02 Oct 2019 19:26:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49689) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFnyo-0005D9-BK for qemu-devel@nongnu.org; Wed, 02 Oct 2019 19:24:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFnyn-00060N-1D for qemu-devel@nongnu.org; Wed, 02 Oct 2019 19:24:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40740) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFnyk-0005xb-6D; Wed, 02 Oct 2019 19:24:18 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6DF92307D92E; Wed, 2 Oct 2019 23:24:17 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-165.bos.redhat.com [10.18.17.165]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9898760BE0; Wed, 2 Oct 2019 23:24:11 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v3] dirty-bitmaps: remove deprecated autoload parameter Date: Wed, 2 Oct 2019 19:24:11 -0400 Message-Id: <20191002232411.29968-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 02 Oct 2019 23:24:17 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Vladimir Sementsov-Ogievskiy , "Daniel P . Berrange" , qemu-block@nongnu.org, libvir-list@redhat.com, John Snow , Markus Armbruster , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This parameter has been deprecated since 2.12.0 and is eligible for removal. Remove this parameter as it is actually completely ignored; let's not give false hope. Signed-off-by: John Snow Reviewed-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy --- V2: Change 2.12.0 -> 4.2.0 in removed section. Adjust phrasing to match. qemu-deprecated.texi | 20 +++++++++++++++----- qapi/block-core.json | 6 +----- blockdev.c | 6 ------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 01245e0b1c..7239e0959d 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -149,11 +149,6 @@ QEMU 4.1 has three options, please migrate to one of t= hese three: =20 @section QEMU Machine Protocol (QMP) commands =20 -@subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0) - -"autoload" parameter is now ignored. All bitmaps are automatically loaded -from qcow2 images. - @subsection query-block result field dirty-bitmaps[i].status (since 4.0) =20 The ``status'' field of the ``BlockDirtyInfo'' structure, returned by @@ -356,3 +351,18 @@ existing CPU models. Management software that needs r= unnability guarantees must resolve the CPU model aliases using te ``alias-of'' field returned by the ``query-cpu-definitions'' QMP command. + + +@node Recently removed features +@appendix Recently removed features + +What follows is a record of recently removed, formerly deprecated +features that serves as a record for users who have encountered +trouble after a recent upgrade. + +@section QEMU Machine Protocol (QMP) commands + +@subsection block-dirty-bitmap-add "autoload" parameter (since 4.2.0) + +The "autoload" parameter has been ignored since 2.12.0. All bitmaps +are automatically loaded from qcow2 images. diff --git a/qapi/block-core.json b/qapi/block-core.json index e6edd641f1..e4975ece4a 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1987,10 +1987,6 @@ # Qcow2 disks support persistent bitmaps. Default is false for # block-dirty-bitmap-add. (Since: 2.10) # -# @autoload: ignored and deprecated since 2.12. -# Currently, all dirty tracking bitmaps are loaded from Qcow2 on -# open. -# # @disabled: the bitmap is created in the disabled state, which means that # it will not track drive changes. The bitmap may be enabled wi= th # block-dirty-bitmap-enable. Default is false. (Since: 4.0) @@ -1999,7 +1995,7 @@ ## { 'struct': 'BlockDirtyBitmapAdd', 'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32', - '*persistent': 'bool', '*autoload': 'bool', '*disabled': 'bool= ' } } + '*persistent': 'bool', '*disabled': 'bool' } } =20 ## # @BlockDirtyBitmapMergeSource: diff --git a/blockdev.c b/blockdev.c index fbef6845c8..93804da840 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1966,7 +1966,6 @@ static void block_dirty_bitmap_add_prepare(BlkActionS= tate *common, qmp_block_dirty_bitmap_add(action->node, action->name, action->has_granularity, action->granularit= y, action->has_persistent, action->persistent, - action->has_autoload, action->autoload, action->has_disabled, action->disabled, &local_err); =20 @@ -2858,7 +2857,6 @@ out: void qmp_block_dirty_bitmap_add(const char *node, const char *name, bool has_granularity, uint32_t granularity, bool has_persistent, bool persistent, - bool has_autoload, bool autoload, bool has_disabled, bool disabled, Error **errp) { @@ -2890,10 +2888,6 @@ void qmp_block_dirty_bitmap_add(const char *node, co= nst char *name, persistent =3D false; } =20 - if (has_autoload) { - warn_report("Autoload option is deprecated and its value is ignore= d"); - } - if (!has_disabled) { disabled =3D false; } --=20 2.21.0