diff options
| author | Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> | 2023-04-28 22:49:28 +0300 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2023-05-10 18:48:12 +0200 |
| commit | 121ccedc2bf0c124e93991275336415d12d2e3df (patch) | |
| tree | 980bc06c2ec205653f3e2736a360f7c8c2170c86 | |
| parent | d70178a88fe8d0873508f6d4757018092262e9ec (diff) | |
| download | focaccia-qemu-121ccedc2bf0c124e93991275336415d12d2e3df.tar.gz focaccia-qemu-121ccedc2bf0c124e93991275336415d12d2e3df.zip | |
migration: block incoming colo when capability is disabled
We generally require same set of capabilities on source and target. Let's require x-colo capability to use COLO on target. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> Reviewed-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com> Reviewed-by: Lukas Straub <lukasstraub2@web.de> Reviewed-by: Zhang Chen <chen.zhang@intel.com> Message-Id: <20230428194928.1426370-11-vsementsov@yandex-team.ru> Signed-off-by: Juan Quintela <quintela@redhat.com>
| -rw-r--r-- | docs/COLO-FT.txt | 1 | ||||
| -rw-r--r-- | migration/migration.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt index 8ec653f81c..2e760a4aee 100644 --- a/docs/COLO-FT.txt +++ b/docs/COLO-FT.txt @@ -210,6 +210,7 @@ children.0=childs0 \ 3. On Secondary VM's QEMU monitor, issue command {"execute":"qmp_capabilities"} +{"execute": "migrate-set-capabilities", "arguments": {"capabilities": [ {"capability": "x-colo", "state": true } ] } } {"execute": "nbd-server-start", "arguments": {"addr": {"type": "inet", "data": {"host": "0.0.0.0", "port": "9999"} } } } {"execute": "nbd-server-add", "arguments": {"device": "parent0", "writable": true } } diff --git a/migration/migration.c b/migration/migration.c index bb254e4f07..439e8651df 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -398,6 +398,12 @@ int migration_incoming_enable_colo(void) return -ENOTSUP; #endif + if (!migrate_colo()) { + error_report("ENABLE_COLO command come in migration stream, but c-colo " + "capability is not set"); + return -EINVAL; + } + if (ram_block_discard_disable(true)) { error_report("COLO: cannot disable RAM discard"); return -EBUSY; |