Peter Xu <pet...@redhat.com> writes:
> On Fri, Apr 26, 2024 at 10:14:05AM -0300, Fabiano Rosas wrote:
>> @@ -2003,21 +1997,7 @@ static bool migrate_prepare(MigrationState *s, bool
>> blk, bool resume,
>> }
>> }
>>
>> - if (blk) {
>> - if (migrate_colo()) {
>> - error_setg(errp, "No disk migration is required in COLO mode");
>> - return false;
>> - }
>> - if (migrate_block()) {
>> - error_setg(errp, "Command options are incompatible with "
>> - "current migration capabilities");
>> - return false;
>> - }
>> - if (!migrate_cap_set(MIGRATION_CAPABILITY_BLOCK, true, errp)) {
>> - return false;
>> - }
>> - s->must_remove_block_options = true;
>> - }
>> + s->must_remove_block_options = true;
>
> Can we drop this var too? Perhaps with block_cleanup_parameters()?
Yes, Markus mentioned it in v1 already. Take a look there. There's
several other declarations I missed. v3 is coming soon.
