diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-11-22 13:45:06 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-11-22 13:45:06 +0000 |
| commit | ebfd6216ec14f8e0f8c9b167493e8a6e4484d75d (patch) | |
| tree | bc5b4ddabcea3e7aeeb21ed43e31988926f558ce /migration/migration.c | |
| parent | 47c1cc30e440860aa695358f7c2dd0b9d7b53d16 (diff) | |
| parent | 7e934f5b27eee1b0d77be3dcf1fd18d4ccc602cc (diff) | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20181121a' into staging
Migration fixes 2018-11-21
Notably the fix for building with --disable-replication
# gpg: Signature made Wed 21 Nov 2018 13:03:20 GMT
# gpg: using RSA key 0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-migration-20181121a:
migration/migration.c: Add COLO dependency checks
migration/colo.c: Fix compilation issue when disable replication
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/migration.c')
| -rw-r--r-- | migration/migration.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/migration/migration.c b/migration/migration.c index b261c1e4ce..49ffb9997a 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -918,6 +918,15 @@ static bool migrate_caps_check(bool *cap_list, } #endif +#ifndef CONFIG_REPLICATION + if (cap_list[MIGRATION_CAPABILITY_X_COLO]) { + error_setg(errp, "QEMU compiled without replication module" + " can't enable COLO"); + error_append_hint(errp, "Please enable replication before COLO.\n"); + return false; + } +#endif + if (cap_list[MIGRATION_CAPABILITY_POSTCOPY_RAM]) { if (cap_list[MIGRATION_CAPABILITY_COMPRESS]) { /* The decompression threads asynchronously write into RAM |