Commit dd0ee30c authored by Peter Xu's avatar Peter Xu Committed by Dr. David Alan Gilbert
Browse files

migration: fix applying wrong capabilities 



When setting migration capabilities via QMP/HMP, we'll apply them even
if the capability check failed.  Fix it.

Fixes: 4a84214e ("migration: provide migrate_caps_check()", 2017-07-18)
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <20180305094938.31374-1-peterx@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent ef9c5160

migration/migration.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

    }