diff options
| author | zhanghailiang <zhang.zhanghailiang@huawei.com> | 2016-10-27 14:42:53 +0800 |
|---|---|---|
| committer | Amit Shah <amit@amitshah.net> | 2016-10-30 15:17:39 +0530 |
| commit | 5821ebf93b1da9f74dc04c20e2923aadfaf803df (patch) | |
| tree | f9bf82c835185d3404eebb0e775c81d2d56b97bf /vl.c | |
| parent | 35a6ed4f716c1027c04d12a3c499b2e9d6b62c24 (diff) | |
| download | focaccia-qemu-5821ebf93b1da9f74dc04c20e2923aadfaf803df.tar.gz focaccia-qemu-5821ebf93b1da9f74dc04c20e2923aadfaf803df.zip | |
COLO: migrate COLO related info to secondary node
We can determine whether or not VM in destination should go into COLO mode by referring to the info that was migrated. We skip this section if COLO is not enabled (i.e. migrate_set_capability colo off), so that, It doesn't break compatibility with migration no matter whether users configure the --enable-colo/disable-colo on the source/destination side or not; Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com> Signed-off-by: Gonglei <arei.gonglei@huawei.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Amit Shah <amit@amitshah.net>
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vl.c b/vl.c index 74dfe4eef9..a1cee4f3f4 100644 --- a/vl.c +++ b/vl.c @@ -90,6 +90,7 @@ int main(int argc, char **argv) #include "audio/audio.h" #include "migration/migration.h" #include "sysemu/cpus.h" +#include "migration/colo.h" #include "sysemu/kvm.h" #include "qapi/qmp/qjson.h" #include "qemu/option.h" @@ -4426,6 +4427,8 @@ int main(int argc, char **argv, char **envp) #endif } + colo_info_init(); + if (net_init_clients() < 0) { exit(1); } |