* Peter Xu ([email protected]) wrote:
> When setting migration capabilities via QMP/HMP, we'll apply them even
> if the capability check failed. Fix it.
>
> Fixes: 4a84214ebe ("migration: provide migrate_caps_check()", 2017-07-18)
> Signed-off-by: Peter Xu <[email protected]>
Queued
> ---
> migration/migration.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/migration/migration.c b/migration/migration.c
> index 0aa596f867..88ed9375aa 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -747,13 +747,15 @@ void
> qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
> {
> MigrationState *s = migrate_get_current();
> MigrationCapabilityStatusList *cap;
> + bool cap_list[MIGRATION_CAPABILITY__MAX];
>
> if (migration_is_setup_or_active(s->state)) {
> error_setg(errp, QERR_MIGRATION_ACTIVE);
> return;
> }
>
> - if (!migrate_caps_check(s->enabled_capabilities, params, errp)) {
> + memcpy(cap_list, s->enabled_capabilities, sizeof(cap_list));
> + if (!migrate_caps_check(cap_list, params, errp)) {
> return;
> }
>
> --
> 2.14.3
>
>
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
