From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59213) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWMLK-0001wb-Ux for qemu-devel@nongnu.org; Tue, 23 Sep 2014 05:25:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XWMLG-0008IC-28 for qemu-devel@nongnu.org; Tue, 23 Sep 2014 05:25:06 -0400 Received: from [59.151.112.132] (port=56236 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWMLF-00084T-La for qemu-devel@nongnu.org; Tue, 23 Sep 2014 05:25:02 -0400 From: Yang Hongyang Date: Tue, 23 Sep 2014 17:23:46 +0800 Message-ID: <1411464235-5653-15-git-send-email-yanghy@cn.fujitsu.com> In-Reply-To: <1411464235-5653-1-git-send-email-yanghy@cn.fujitsu.com> References: <1411464235-5653-1-git-send-email-yanghy@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [RFC PATCH v2 14/23] COLO ctl: implement colo restore List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: GuiJianfeng@cn.fujitsu.com, yunhong.jiang@intel.com, eddie.dong@intel.com, dgilbert@redhat.com, mrhines@linux.vnet.ibm.com, yanghy@cn.fujitsu.com implement colo restore Signed-off-by: Yang Hongyang --- migration-colo.c | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/migration-colo.c b/migration-colo.c index d99342a..91634d2 100644 --- a/migration-colo.c +++ b/migration-colo.c @@ -426,8 +426,11 @@ void colo_process_incoming_checkpoints(QEMUFile *f) { int fd = qemu_get_fd(f); int dev_hotplug = qdev_hotplug; - QEMUFile *ctl = NULL; + QEMUFile *ctl = NULL, *fb = NULL; int ret; + uint64_t total_size; + uint8_t *buf; + QEMUSizedBuffer *colo_buffer; if (!restore_use_colo()) { return; @@ -449,7 +452,8 @@ void colo_process_incoming_checkpoints(QEMUFile *f) goto out; } - /* TODO: in COLO mode, slave is runing, so start the vm */ + /* in COLO mode, slave is runing, so start the vm */ + vm_start(); while (true) { if (slave_wait_new_checkpoint(f)) { @@ -458,7 +462,8 @@ void colo_process_incoming_checkpoints(QEMUFile *f) /* start colo checkpoint */ - /* TODO: suspend guest */ + /* suspend guest */ + vm_stop_force_state(RUN_STATE_COLO); ret = colo_ctl_put(ctl, COLO_CHECKPOINT_SUSPENDED); if (ret) { @@ -470,26 +475,55 @@ void colo_process_incoming_checkpoints(QEMUFile *f) goto out; } - /* TODO: read migration data into colo buffer */ + /* read migration data into colo buffer */ + + /* read the vmstate total size first */ + ret = colo_ctl_get_value(f, &total_size); + if (ret) { + goto out; + } + buf = g_malloc(total_size); + qemu_get_buffer(f, buf, total_size); + colo_buffer = qsb_create(buf, total_size); + g_free(buf); ret = colo_ctl_put(ctl, COLO_CHECKPOINT_RECEIVED); if (ret) { goto out; } - /* TODO: load vm state */ + /* open colo buffer for read */ + fb = qemu_bufopen("r", colo_buffer); + if (!fb) { + error_report("can't open colo buffer for read"); + goto out; + } + + /* load vm state */ + if (qemu_loadvm_state(fb) < 0) { + error_report("COLO: loadvm failed\n"); + goto out; + } ret = colo_ctl_put(ctl, COLO_CHECKPOINT_LOADED); if (ret) { goto out; } - /* TODO: resume guest */ + /* resume guest */ + vm_start(); + + qemu_fclose(fb); + fb = NULL; } out: colo = NULL; + if (fb) { + qemu_fclose(fb); + } + if (ctl) { qemu_fclose(ctl); } -- 1.9.1