[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 23/38] migration: migrate 'blk' command option is deprecated.
From: |
Juan Quintela |
Subject: |
[PULL 23/38] migration: migrate 'blk' command option is deprecated. |
Date: |
Tue, 31 Oct 2023 10:01:27 +0100 |
Use blocked-mirror with NBD instead.
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231018115513.2163-4-quintela@redhat.com>
---
docs/about/deprecated.rst | 9 +++++++++
qapi/migration.json | 7 ++++---
migration/migration-hmp-cmds.c | 5 +++++
migration/migration.c | 5 +++++
4 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 1c8c8c34c4..c1613468e6 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -477,3 +477,12 @@ Use blockdev-mirror with NBD instead.
As an intermediate step the ``inc`` functionality can be achieved by
setting the ``block-incremental`` migration parameter to ``true``.
But this parameter is also deprecated.
+
+``blk`` migrate command option (since 8.2)
+''''''''''''''''''''''''''''''''''''''''''
+
+Use blockdev-mirror with NBD instead.
+
+As an intermediate step the ``blk`` functionality can be achieved by
+setting the ``block`` migration capability to ``true``. But this
+capability is also deprecated.
diff --git a/qapi/migration.json b/qapi/migration.json
index fa7f4f2575..3765c2b662 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -1526,8 +1526,8 @@
#
# Features:
#
-# @deprecated: Member @inc is deprecated. Use blockdev-mirror with
-# NBD instead.
+# @deprecated: Members @inc and @blk are deprecated. Use
+# blockdev-mirror with NBD instead.
#
# Returns: nothing on success
#
@@ -1550,7 +1550,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' } }
diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
index 83176f5bae..dfe98da355 100644
--- a/migration/migration-hmp-cmds.c
+++ b/migration/migration-hmp-cmds.c
@@ -750,6 +750,11 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
" use blockdev-mirror with NBD instead");
}
+ if (blk) {
+ warn_report("option '-b' is deprecated;"
+ " use blockdev-mirror with NBD instead");
+ }
+
qmp_migrate(uri, !!blk, blk, !!inc, inc,
false, false, true, resume, &err);
if (hmp_handle_error(mon, err)) {
diff --git a/migration/migration.c b/migration/migration.c
index 06a706ad90..cb2d7161b5 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1625,6 +1625,11 @@ static bool migrate_prepare(MigrationState *s, bool blk,
bool blk_inc,
" use blockdev-mirror with NBD instead");
}
+ if (blk) {
+ warn_report("parameter 'blk' is deprecated;"
+ " use blockdev-mirror with NBD instead");
+ }
+
if (resume) {
if (s->state != MIGRATION_STATUS_POSTCOPY_PAUSED) {
error_setg(errp, "Cannot resume if there is no "
--
2.41.0
- [PULL 15/38] migration: Move ram_flush_compressed_data() to ram-compress.c, (continued)
- [PULL 15/38] migration: Move ram_flush_compressed_data() to ram-compress.c, Juan Quintela, 2023/10/31
- [PULL 11/38] migration: Simplify compress_page_with_multithread(), Juan Quintela, 2023/10/31
- [PULL 18/38] migration/ram: Fix compilation with -Wshadow=local, Juan Quintela, 2023/10/31
- [PULL 13/38] migration: Create compress_update_rates(), Juan Quintela, 2023/10/31
- [PULL 19/38] migration: rename vmstate_save_needed->vmstate_section_needed, Juan Quintela, 2023/10/31
- [PULL 20/38] migration: set file error on subsection loading, Juan Quintela, 2023/10/31
- [PULL 21/38] qemu-iotests: Filter warnings about block migration being deprecated, Juan Quintela, 2023/10/31
- [PULL 16/38] migration: Merge flush_compressed_data() and compress_flush_data(), Juan Quintela, 2023/10/31
- [PULL 17/38] migration: Rename ram_compressed_pages() to compress_ram_pages(), Juan Quintela, 2023/10/31
- [PULL 22/38] migration: migrate 'inc' command option is deprecated., Juan Quintela, 2023/10/31
- [PULL 23/38] migration: migrate 'blk' command option is deprecated.,
Juan Quintela <=
- [PULL 26/38] migration: Stop migration immediately in RDMA error paths, Juan Quintela, 2023/10/31
- [PULL 27/38] qemu-file: Don't increment qemu_file_transferred at qemu_file_fill_buffer, Juan Quintela, 2023/10/31
- [PULL 29/38] qemu_file: total_transferred is not used anymore, Juan Quintela, 2023/10/31
- [PULL 25/38] migration: Deprecate old compression method, Juan Quintela, 2023/10/31
- [PULL 24/38] migration: Deprecate block migration, Juan Quintela, 2023/10/31
- [PULL 28/38] qemu_file: Use a stat64 for qemu_file_transferred, Juan Quintela, 2023/10/31
- [PULL 32/38] qemu-file: Remove _noflush from qemu_file_transferred_noflush(), Juan Quintela, 2023/10/31
- [PULL 34/38] migration: migration_rate_limit_reset() don't need the QEMUFile, Juan Quintela, 2023/10/31
- [PULL 30/38] migration: Use the number of transferred bytes directly, Juan Quintela, 2023/10/31
- [PULL 33/38] migration: migration_transferred_bytes() don't need the QEMUFile, Juan Quintela, 2023/10/31