diff mbox

[RFC,v3,06/27] migration: Don't send vm description in COLO mode

Message ID 1423711034-5340-7-git-send-email-zhang.zhanghailiang@huawei.com
State New
Headers show

Commit Message

Zhanghailiang Feb. 12, 2015, 3:16 a.m. UTC 
Commit 8118f09 add vm description to the end of migration
stream, but in COLO mode, we use the migration channel to send
control code, so the additional info been send will cause slave
receive unexpect control msg, so just do not send vm description
when migrate under COLO mode.

Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com>
---
 savevm.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/savevm.c b/savevm.c
index 8040766..7d79a4b 100644
--- a/savevm.c
+++ b/savevm.c
@@ -782,9 +782,11 @@  void qemu_savevm_state_complete(QEMUFile *f)
     qjson_finish(vmdesc);
     vmdesc_len = strlen(qjson_get_str(vmdesc));
 
-    qemu_put_byte(f, QEMU_VM_VMDESCRIPTION);
-    qemu_put_be32(f, vmdesc_len);
-    qemu_put_buffer(f, (uint8_t *)qjson_get_str(vmdesc), vmdesc_len);
+    if (!migrate_enable_colo()) {
+        qemu_put_byte(f, QEMU_VM_VMDESCRIPTION);
+        qemu_put_be32(f, vmdesc_len);
+        qemu_put_buffer(f, (uint8_t *)qjson_get_str(vmdesc), vmdesc_len);
+    }
     object_unref(OBJECT(vmdesc));
 
     qemu_fflush(f);