From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtaH6-0007MX-K9 for qemu-devel@nongnu.org; Tue, 03 Nov 2015 07:01:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtaH5-0002kS-Hp for qemu-devel@nongnu.org; Tue, 03 Nov 2015 07:01:16 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:11373) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtaH4-0002jO-NT for qemu-devel@nongnu.org; Tue, 03 Nov 2015 07:01:15 -0500 From: zhanghailiang Date: Tue, 3 Nov 2015 19:56:32 +0800 Message-ID: <1446551816-15768-15-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1446551816-15768-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1446551816-15768-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-Frame v10 14/38] COLO: Load VMState into qsb before restore it List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lizhijian@cn.fujitsu.com, quintela@redhat.com, yunhong.jiang@intel.com, eddie.dong@intel.com, peter.huangpeng@huawei.com, dgilbert@redhat.com, arei.gonglei@huawei.com, stefanha@redhat.com, amit.shah@redhat.com, zhanghailiang We should not destroy the state of SVM (Secondary VM) until we receive the whole state from the PVM (Primary VM), in case the primary fails in the middle of sending the state, so, here we cache the device state in Secondary before restore it. Besides, we should call qemu_system_reset() before load VM state, which can ensure the data is intact. Signed-off-by: zhanghailiang Signed-off-by: Li Zhijian Signed-off-by: Gonglei Reviewed-by: Dr. David Alan Gilbert --- migration/colo.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/migration/colo.c b/migration/colo.c index 25f85b2..1339774 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -287,6 +287,9 @@ static int colo_wait_handle_cmd(QEMUFile *f, int *checkpoint_request) void *colo_process_incoming_thread(void *opaque) { MigrationIncomingState *mis = opaque; + QEMUFile *fb = NULL; + QEMUSizedBuffer *buffer = NULL; /* Cache incoming device state */ + int total_size; int fd, ret = 0; migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, @@ -310,6 +313,12 @@ void *colo_process_incoming_thread(void *opaque) goto out; } + buffer = qsb_create(NULL, COLO_BUFFER_BASE_SIZE); + if (buffer == NULL) { + error_report("Failed to allocate colo buffer!"); + goto out; + } + ret = colo_ctl_put(mis->to_src_file, COLO_COMMAND_CHECKPOINT_READY, 0); if (ret < 0) { goto out; @@ -337,19 +346,50 @@ void *colo_process_incoming_thread(void *opaque) goto out; } - /* TODO Load VM state */ + /* read the VM state total size first */ + total_size = colo_ctl_get(mis->from_src_file, + COLO_COMMAND_VMSTATE_SIZE); + if (total_size <= 0) { + goto out; + } + + /* read vm device state into colo buffer */ + ret = qsb_fill_buffer(buffer, mis->from_src_file, total_size); + if (ret != total_size) { + error_report("can't get all migration data"); + goto out; + } ret = colo_ctl_put(mis->to_src_file, COLO_COMMAND_VMSTATE_RECEIVED, 0); if (ret < 0) { goto out; } + /* open colo buffer for read */ + fb = qemu_bufopen("r", buffer); + if (!fb) { + error_report("can't open colo buffer for read"); + goto out; + } + + qemu_mutex_lock_iothread(); + qemu_system_reset(VMRESET_SILENT); + if (qemu_loadvm_state(fb) < 0) { + error_report("COLO: loadvm failed"); + qemu_mutex_unlock_iothread(); + goto out; + } + qemu_mutex_unlock_iothread(); + /* TODO: flush vm state */ ret = colo_ctl_put(mis->to_src_file, COLO_COMMAND_VMSTATE_LOADED, 0); if (ret < 0) { goto out; } + + qemu_fclose(fb); + fb = NULL; } out: @@ -358,6 +398,11 @@ out: strerror(-ret)); } + if (fb) { + qemu_fclose(fb); + } + qsb_free(buffer); + qemu_mutex_lock_iothread(); colo_release_ram_cache(); qemu_mutex_unlock_iothread(); -- 1.8.3.1