diff options
| author | Peter Xu <peterx@redhat.com> | 2017-07-18 11:39:07 +0800 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-07-18 17:36:24 +0200 |
| commit | fd198f9002a9e1f070c82b04d3229c18d9a49471 (patch) | |
| tree | bcb5618d4184b63ba2452e6f136bd4430e30886b /migration | |
| parent | 8b0b29dcec59730e6b21b253a6b43271cb3d831b (diff) | |
| download | qemu-fd198f9002a9e1f070c82b04d3229c18d9a49471.tar.gz | |
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')
| -rw-r--r-- | migration/colo.c | 5 | ||||
| -rw-r--r-- | migration/migration.c | 11 |
2 files changed, 0 insertions, 16 deletions
diff --git a/migration/colo.c b/migration/colo.c index ef35f00c9a..a4255432ac 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -29,11 +29,6 @@ static bool vmstate_loading; #define COLO_BUFFER_BASE_SIZE (4 * 1024 * 1024) -bool colo_supported(void) -{ - return true; -} - bool migration_in_colo_state(void) { MigrationState *s = migrate_get_current(); 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; } |