summary refs log tree commit diff stats
path: root/migration/migration.c
diff options
context:
space:
mode:
authorPeter Xu <peterx@redhat.com>2017-07-18 11:39:07 +0800
committerJuan Quintela <quintela@redhat.com>2017-07-18 17:36:24 +0200
commitfd198f9002a9e1f070c82b04d3229c18d9a49471 (patch)
treebcb5618d4184b63ba2452e6f136bd4430e30886b /migration/migration.c
parent8b0b29dcec59730e6b21b253a6b43271cb3d831b (diff)
downloadfocaccia-qemu-fd198f9002a9e1f070c82b04d3229c18d9a49471.tar.gz
focaccia-qemu-fd198f9002a9e1f070c82b04d3229c18d9a49471.zip
migration: remove check against colo support
Since commit a15215f3 ("build: remove --enable-colo/--disable-colo"),
colo is always supported. We don't need any colo_supported() now since
it is always true. Removing any extra code that depends on it.

CC: Paolo Bonzini <pbonzini@redhat.com>
CC: Hailiang Zhang <zhang.zhanghailiang@huawei.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Zhang Chen<zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <1500349150-13240-8-git-send-email-peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration/migration.c')
-rw-r--r--migration/migration.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/migration/migration.c b/migration/migration.c
index c59dad9948..915c8cc11f 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -412,9 +412,6 @@ MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp)
             continue;
         }
 #endif
-        if (i == MIGRATION_CAPABILITY_X_COLO && !colo_supported()) {
-            continue;
-        }
         if (head == NULL) {
             head = g_malloc0(sizeof(*caps));
             caps = head;
@@ -613,14 +610,6 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
             continue;
         }
 #endif
-        if (cap->value->capability == MIGRATION_CAPABILITY_X_COLO) {
-            if (!colo_supported()) {
-                error_setg(errp, "COLO is not currently supported, please"
-                             " configure with --enable-colo option in order to"
-                             " support COLO feature");
-                continue;
-            }
-        }
         s->enabled_capabilities[cap->value->capability] = cap->value->state;
     }