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 C21F7C46CA1 for ; Thu, 12 Oct 2023 10:02:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qqsVR-0007DD-VR; Thu, 12 Oct 2023 06:01:25 -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 1qqsVO-0007Ao-FX for qemu-devel@nongnu.org; Thu, 12 Oct 2023 06:01:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qqsVM-00071U-Ml for qemu-devel@nongnu.org; Thu, 12 Oct 2023 06:01:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697104880; 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=hwpdsVN23eMGEuNyMpl2AGYfcBtwRIWeUtSMrXTsq2U=; b=ex9jLpXIsmnnFbfZ677hLgArNpjBLk6o6nITxVbkaYis72nYoveL7hQFyMra1SpBG0qD3i kLW6c+keDVQ1OUGzpfWZZLERo5/pV1l9uUdqjl1RF7tJS+5nIUxJGpgMH4ZYmHrJ09xXgP dnh+QRqcAKs4Gn7LsM4Tww2U8D0KfUY= 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-133-_CMxC88gNqmmEmunmfs0GA-1; Thu, 12 Oct 2023 06:01:07 -0400 X-MC-Unique: _CMxC88gNqmmEmunmfs0GA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 4DE5D3822E80; Thu, 12 Oct 2023 10:01:07 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.72]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 091182026D2B; Thu, 12 Oct 2023 10:01:07 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 00C3921E6A1F; Thu, 12 Oct 2023 12:01:05 +0200 (CEST) From: Markus Armbruster To: Juan Quintela Cc: qemu-devel@nongnu.org, Fam Zheng , Eric Blake , libvir-list@redhat.com, Leonardo Bras , Daniel P . =?utf-8?Q?Berrang=C3=A9?= , Stefan Hajnoczi , Paolo Bonzini , Fabiano Rosas , Peter Xu , qemu-block@nongnu.org, Thomas Huth , Kevin Wolf , Hanna Czenczek Subject: Re: [PATCH v3 3/4] migration: Deprecate block migration References: <20231011204711.9744-1-quintela@redhat.com> <20231011204711.9744-4-quintela@redhat.com> Date: Thu, 12 Oct 2023 12:01:05 +0200 In-Reply-To: <20231011204711.9744-4-quintela@redhat.com> (Juan Quintela's message of "Wed, 11 Oct 2023 22:47:10 +0200") Message-ID: <87r0m0yxb2.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.1 on 10.11.54.4 Received-SPF: pass client-ip=170.10.129.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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: > It is obsolete. It is better to use driver-mirror with NBD instead. drive-mirror Several more below. > > CC: Kevin Wolf > CC: Eric Blake > CC: Stefan Hajnoczi > CC: Hanna Czenczek > > Signed-off-by: Juan Quintela > --- > docs/about/deprecated.rst | 10 ++++++++++ > qapi/migration.json | 30 +++++++++++++++++++++++++----- > migration/block.c | 3 +++ > migration/options.c | 9 ++++++++- > 4 files changed, 46 insertions(+), 6 deletions(-) > > diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst > index b2b7e11742..e46f3df376 100644 > --- a/docs/about/deprecated.rst > +++ b/docs/about/deprecated.rst > @@ -431,3 +431,13 @@ The new way to modify migration is using migration parameters. > ``blk`` functionality can be achieved by setting the > ``block`` migration capability to ``true``. > > +block migration (since 8.2) > +''''''''''''''''''''''''''' > + > +Block migration is too inflexible. It needs to migrate all block > +devices or none. > + > +Please see "QMP invocation for live storage migration with > +``driver-mirror`` + NBD" in docs/interop/live-block-operations.rst for > +a detailed explanation. > + > diff --git a/qapi/migration.json b/qapi/migration.json > index e4949e0d8e..bf6e1ac5b5 100644 > --- a/qapi/migration.json > +++ b/qapi/migration.json > @@ -269,11 +269,16 @@ > # average memory load of the virtual CPU indirectly. Note that > # zero means guest doesn't dirty memory. (Since 8.1) > # > +# Features: > +# > +# @deprecated: @disk migration is deprecated. Use driver-mirror > +# with NBD instead. > +# Suggest: # @deprecated: Member @disk is deprecated because block migration is. > # 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', > @@ -526,6 +531,9 @@ > # > # Features: > # > +# @deprecated: @block migration is deprecated. Use driver-mirror > +# with NBD instead. > +# Suggest: # @deprecated: Member @block is deprecated. Use drrive-mirror with # NBD instead. > # @unstable: Members @x-colo and @x-ignore-shared are experimental. > # > # Since: 1.2 > @@ -535,7 +543,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', > @@ -826,6 +835,9 @@ > # > # Features: > # > +# @deprecated: Member @block-incremental is obsolete. Use > +# driver-mirror with NBD instead. > +# Wait! This is what PATCH 1 tells users to use instead of deprecated @inc. You need to update that deprecation note to point to a non-deprecated replacement. > # @unstable: Members @x-checkpoint-delay and @x-vcpu-dirty-limit-period > # are experimental. > # > @@ -841,7 +853,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', > @@ -992,6 +1004,9 @@ > # > # Features: > # > +# @deprecated: Member @block-incremental is obsolete. Use > +# driver-mirror with NBD instead. > +# > # @unstable: Members @x-checkpoint-delay and @x-vcpu-dirty-limit-period > # are experimental. > # > @@ -1020,7 +1035,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', > @@ -1195,6 +1211,9 @@ > # > # Features: > # > +# @deprecated: Member @block-incremental is obsolete. Use > +# driver-mirror with NBD instead. > +# > # @unstable: Members @x-checkpoint-delay and @x-vcpu-dirty-limit-period > # are experimental. > # > @@ -1220,7 +1239,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', > diff --git a/migration/block.c b/migration/block.c > index 5f930870a5..46bb431ed3 100644 > --- a/migration/block.c > +++ b/migration/block.c > @@ -729,6 +729,9 @@ static int block_save_setup(QEMUFile *f, void *opaque) > trace_migration_block_save("setup", block_mig_state.submitted, > block_mig_state.transferred); > > + warn_report("block migration is deprecated. Use driver-mirror with" > + "NBD instead."); > + > qemu_mutex_lock_iothread(); > ret = init_blk_migration(f); > if (ret < 0) { > diff --git a/migration/options.c b/migration/options.c > index 6bbfd4853d..48cbbd682a 100644 > --- a/migration/options.c > +++ b/migration/options.c > @@ -12,6 +12,7 @@ > */ > > #include "qemu/osdep.h" > +#include "qemu/error-report.h" > #include "exec/target_page.h" > #include "qapi/clone-visitor.h" > #include "qapi/error.h" > @@ -464,10 +465,14 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp) > if (new_caps[MIGRATION_CAPABILITY_BLOCK]) { > error_setg(errp, "QEMU compiled without old-style (blk/-b, inc/-i) " > "block migration"); > - error_append_hint(errp, "Use drive_mirror+NBD instead.\n"); > + error_append_hint(errp, "Use driver-mirror with NBD instead.\n"); > return false; > } > #endif > + if (new_caps[MIGRATION_CAPABILITY_BLOCK]) { > + warn_report("Block migration is deprecated. " > + "Use driver-mirror with NBD instead."); > + } > > #ifndef CONFIG_REPLICATION > if (new_caps[MIGRATION_CAPABILITY_X_COLO]) { > @@ -1351,6 +1356,8 @@ static void migrate_params_apply(MigrateSetParameters *params, Error **errp) > } > > if (params->has_block_incremental) { > + warn_report("Block migration is deprecated. " > + "Use driver-mirror with NBD instead."); > s->parameters.block_incremental = params->block_incremental; > } > if (params->has_multifd_channels) {