From patchwork Tue Sep 23 09:23:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Hongyang X-Patchwork-Id: 392300 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CEC781400B2 for ; Tue, 23 Sep 2014 19:29:30 +1000 (EST) Received: from localhost ([::1]:51797 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWMPY-0000m7-Vu for incoming@patchwork.ozlabs.org; Tue, 23 Sep 2014 05:29:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWMLG-0001py-8p for qemu-devel@nongnu.org; Tue, 23 Sep 2014 05:25:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XWMLB-00088a-LI for qemu-devel@nongnu.org; Tue, 23 Sep 2014 05:25:02 -0400 Received: from [59.151.112.132] (port=47516 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWMLB-00083l-AB for qemu-devel@nongnu.org; Tue, 23 Sep 2014 05:24:57 -0400 X-IronPort-AV: E=Sophos;i="5.04,578,1406563200"; d="scan'208";a="36329436" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 23 Sep 2014 17:21:45 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s8N9OoLb018325; Tue, 23 Sep 2014 17:24:50 +0800 Received: from localhost (10.167.226.223) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Tue, 23 Sep 2014 17:24:47 +0800 From: Yang Hongyang To: Date: Tue, 23 Sep 2014 17:23:39 +0800 Message-ID: <1411464235-5653-8-git-send-email-yanghy@cn.fujitsu.com> X-Mailer: git-send-email 1.9.1 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 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 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 Subject: [Qemu-devel] [RFC PATCH v2 07/23] COLO restore: integrate COLO checkpointed restore into qemu restore X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org enter colo checkpointed restore loop after live migration. Signed-off-by: Yang Hongyang --- include/migration/migration-colo.h | 6 ++++++ migration-colo-comm.c | 10 ++++++++++ migration-colo.c | 22 ++++++++++++++++++++++ migration.c | 3 +++ stubs/migration-colo.c | 4 ++++ 5 files changed, 45 insertions(+) diff --git a/include/migration/migration-colo.h b/include/migration/migration-colo.h index 24589c0..861fa27 100644 --- a/include/migration/migration-colo.h +++ b/include/migration/migration-colo.h @@ -22,4 +22,10 @@ bool colo_supported(void); bool migrate_use_colo(void); void colo_init_checkpointer(MigrationState *s); +/* restore */ +bool restore_use_colo(void); +void restore_exit_colo(void); + +void colo_process_incoming_checkpoints(QEMUFile *f); + #endif diff --git a/migration-colo-comm.c b/migration-colo-comm.c index 4504ceb..b12a57a 100644 --- a/migration-colo-comm.c +++ b/migration-colo-comm.c @@ -38,6 +38,16 @@ static void colo_info_save(QEMUFile *f, void *opaque) /* restore */ +bool restore_use_colo(void) +{ + return colo_requested; +} + +void restore_exit_colo(void) +{ + colo_requested = false; +} + static int colo_info_load(QEMUFile *f, void *opaque, int version_id) { int value = qemu_get_byte(f); diff --git a/migration-colo.c b/migration-colo.c index c3fc313..391e0b7 100644 --- a/migration-colo.c +++ b/migration-colo.c @@ -10,6 +10,7 @@ #include "qemu/main-loop.h" #include "qemu/thread.h" +#include "block/coroutine.h" #include "migration/migration-colo.h" static QEMUBH *colo_bh; @@ -60,3 +61,24 @@ void colo_init_checkpointer(MigrationState *s) colo_bh = qemu_bh_new(colo_start_checkpointer, s); qemu_bh_schedule(colo_bh); } + +/* restore */ + +static Coroutine *colo; + +void colo_process_incoming_checkpoints(QEMUFile *f) +{ + if (!restore_use_colo()) { + return; + } + + colo = qemu_coroutine_self(); + assert(colo != NULL); + + /* TODO: COLO checkpointed restore loop */ + + colo = NULL; + restore_exit_colo(); + + return; +} diff --git a/migration.c b/migration.c index 6a6dce5..06165a7 100644 --- a/migration.c +++ b/migration.c @@ -86,6 +86,9 @@ static void process_incoming_migration_co(void *opaque) int ret; ret = qemu_loadvm_state(f); + if (!ret) { + colo_process_incoming_checkpoints(f); + } qemu_fclose(f); free_xbzrle_decoded_buf(); if (ret < 0) { diff --git a/stubs/migration-colo.c b/stubs/migration-colo.c index 9013c40..55f0d37 100644 --- a/stubs/migration-colo.c +++ b/stubs/migration-colo.c @@ -18,3 +18,7 @@ bool colo_supported(void) void colo_init_checkpointer(MigrationState *s) { } + +void colo_process_incoming_checkpoints(QEMUFile *f) +{ +}