diff options
| author | Fabiano Rosas <farosas@suse.de> | 2024-04-30 11:27:34 -0300 |
|---|---|---|
| committer | Fabiano Rosas <farosas@suse.de> | 2024-05-08 09:20:58 -0300 |
| commit | 18d154f57583dd06f0ce3e69e4952044490b2bc4 (patch) | |
| tree | c92c1ddefb2f309b849ba93ec72f6dced40a6dfe /migration/options.c | |
| parent | 61c4e39f7301f67408024346ad3eb5335aec0311 (diff) | |
| download | focaccia-qemu-18d154f57583dd06f0ce3e69e4952044490b2bc4.tar.gz focaccia-qemu-18d154f57583dd06f0ce3e69e4952044490b2bc4.zip | |
migration: Remove 'blk/-b' option from migrate commands
The block migration is considered obsolete and has been deprecated in
8.2. Remove the migrate command option that enables it. This only
affects the QMP and HMP commands, the feature can still be accessed by
setting the migration 'block' capability. The whole feature will be
removed in a future patch.
Deprecation commit 8846b5bfca ("migration: migrate 'blk' command
option is deprecated.").
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Diffstat (limited to 'migration/options.c')
| -rw-r--r-- | migration/options.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/migration/options.c b/migration/options.c index 5b16d99bd9..856b2fa33c 100644 --- a/migration/options.c +++ b/migration/options.c @@ -486,8 +486,7 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp) #ifndef CONFIG_LIVE_BLOCK_MIGRATION if (new_caps[MIGRATION_CAPABILITY_BLOCK]) { - error_setg(errp, "QEMU compiled without old-style (blk/-b) " - "block migration"); + error_setg(errp, "QEMU compiled without old-style block migration"); error_append_hint(errp, "Use blockdev-mirror with NBD instead.\n"); return false; } @@ -943,17 +942,6 @@ ZeroPageDetection migrate_zero_page_detection(void) /* parameters helpers */ -void block_cleanup_parameters(void) -{ - MigrationState *s = migrate_get_current(); - - if (s->must_remove_block_options) { - /* setting to false can never fail */ - migrate_cap_set(MIGRATION_CAPABILITY_BLOCK, false, &error_abort); - s->must_remove_block_options = false; - } -} - AnnounceParameters *migrate_announce_params(void) { static AnnounceParameters ap; |