From: Peter Xu Date: Tue, 18 Jul 2017 03:39:10 +0000 (+0800) Subject: migration: check global caps for validity X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6b19a7d91c8de9904c67b87203a46e55db4181ab;p=qemu.git migration: check global caps for validity Checks validity for all the capabilities that we enabled with command line. Signed-off-by: Peter Xu Reviewed-by: Juan Quintela Message-Id: <1500349150-13240-11-git-send-email-peterx@redhat.com> Signed-off-by: Juan Quintela --- diff --git a/migration/migration.c b/migration/migration.c index 0ebdde18ed..76153914d1 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2166,11 +2166,27 @@ static void migration_instance_init(Object *obj) */ static bool migration_object_check(MigrationState *ms, Error **errp) { + MigrationCapabilityStatusList *head = NULL; + /* Assuming all off */ + bool cap_list[MIGRATION_CAPABILITY__MAX] = { 0 }, ret; + int i; + if (!migrate_params_check(&ms->parameters, errp)) { return false; } - return true; + for (i = 0; i < MIGRATION_CAPABILITY__MAX; i++) { + if (ms->enabled_capabilities[i]) { + head = migrate_cap_add(head, i, true); + } + } + + ret = migrate_caps_check(cap_list, head, errp); + + /* It works with head == NULL */ + qapi_free_MigrationCapabilityStatusList(head); + + return ret; } static const TypeInfo migration_type = {