From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLkJK-0004QK-UG for qemu-devel@nongnu.org; Wed, 11 Feb 2015 22:19:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLkJF-0005rv-MX for qemu-devel@nongnu.org; Wed, 11 Feb 2015 22:19:26 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:44853) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLkJF-0005rc-1O for qemu-devel@nongnu.org; Wed, 11 Feb 2015 22:19:21 -0500 From: zhanghailiang Date: Thu, 12 Feb 2015 11:16:53 +0800 Message-ID: <1423711034-5340-7-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1423711034-5340-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1423711034-5340-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH RFC v3 06/27] migration: Don't send vm description in COLO mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: zhanghailiang , yunhong.jiang@intel.com, eddie.dong@intel.com, dgilbert@redhat.com, peter.huangpeng@huawei.com, stefanha@redhat.com, pbonzini@redhat.com, Yang Hongyang 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 Signed-off-by: Yang Hongyang --- savevm.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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); -- 1.7.12.4