Fabiano Rosas <farosas@xxxxxxx> writes:
> The block migration has been considered obsolete since QEMU 8.2 in
> favor of the more flexible storage migration provided by the
> blockdev-mirror driver. Two releases have passed so now it's time to
> remove it.
>
> Deprecation commit 66db46ca83 ("migration: Deprecate block
> migration").
>
> Signed-off-by: Fabiano Rosas <farosas@xxxxxxx>
[...]
> diff --git a/migration/migration.c b/migration/migration.c
> index a3dc8a7974..0f4df893e5 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
[...]
> @@ -1997,8 +1983,6 @@ static bool migrate_prepare(MigrationState *s, bool resume, Error **errp)
> }
> }
>
> - s->must_remove_block_options = true;
> -
> if (migrate_init(s, errp)) {
> return false;
> }
> @@ -2080,7 +2064,6 @@ void qmp_migrate(const char *uri, bool has_channels,
> "a valid migration protocol");
> migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
> MIGRATION_STATUS_FAILED);
> - block_cleanup_parameters();
> }
>
> if (local_err) {
> diff --git a/migration/options.c b/migration/options.c
> index 638eeeb9a0..5049bfb78e 100644
> --- a/migration/options.c
> +++ b/migration/options.c
[...]
> @@ -942,17 +917,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;
> - }
> -}
> -
MigrationState member @must_remove_block_options is now unused. Please
delete it.
> AnnounceParameters *migrate_announce_params(void)
> {
> static AnnounceParameters ap;
[...]
With that:
Reviewed-by: Markus Armbruster <armbru@xxxxxxxxxx>
_______________________________________________
Devel mailing list -- devel@xxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx
