From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8jvn-0007BT-2h for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:54:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8jvi-0004nV-VW for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:54:10 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:24119) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8jvi-0004j1-A8 for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:54:06 -0400 From: zhanghailiang Date: Fri, 3 Jun 2016 15:52:39 +0800 Message-ID: <1464940366-9880-28-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1464940366-9880-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1464940366-9880-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-Frame v17 27/34] migration/savevm: Export two helper functions for savevm process List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, amit.shah@redhat.com, quintela@redhat.com, dgilbert@redhat.com Cc: peter.huangpeng@huawei.com, eddie.dong@intel.com, yunhong.jiang@intel.com, wency@cn.fujitsu.com, lizhijian@cn.fujitsu.com, arei.gonglei@huawei.com, stefanha@redhat.com, hongyang.yang@easystack.cn, zhangchen.fnst@cn.fujitsu.com, xiecl.fnst@cn.fujitsu.com, zhanghailiang We add a new helper functions qemu_savevm_live_state(), and make qemu_save_device_state() public. Signed-off-by: zhanghailiang Signed-off-by: Li Zhijian Reviewed-by: Dr. David Alan Gilbert --- v15: - Add Reviewd-by tag v14: - New patch split from previous 'COLO: Separate the process of saving/loading ram and device state --- include/sysemu/sysemu.h | 3 +++ migration/savevm.c | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 2b44981..2f2161a 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -132,6 +132,9 @@ void qemu_savevm_send_postcopy_ram_discard(QEMUFile *f, const char *name, uint64_t *start_list, uint64_t *length_list); +void qemu_savevm_live_state(QEMUFile *f); +int qemu_save_device_state(QEMUFile *f); + int qemu_loadvm_state(QEMUFile *f); int qemu_loadvm_state_begin(QEMUFile *f); int qemu_loadvm_state_main(QEMUFile *f, MigrationIncomingState *mis); diff --git a/migration/savevm.c b/migration/savevm.c index 98abb5c..55a2eab 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -53,6 +53,7 @@ #include "qemu/cutils.h" #include "io/channel-buffer.h" #include "io/channel-file.h" +#include "migration/colo.h" #ifndef ETH_P_RARP #define ETH_P_RARP 0x8035 @@ -1178,13 +1179,20 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp) return ret; } -static int qemu_save_device_state(QEMUFile *f) +void qemu_savevm_live_state(QEMUFile *f) { - SaveStateEntry *se; + /* save QEMU_VM_SECTION_END section */ + qemu_savevm_state_complete_precopy(f, true); + qemu_put_byte(f, QEMU_VM_EOF); +} - qemu_put_be32(f, QEMU_VM_FILE_MAGIC); - qemu_put_be32(f, QEMU_VM_FILE_VERSION); +int qemu_save_device_state(QEMUFile *f) +{ + SaveStateEntry *se; + if (!migration_in_colo_state()) { + qemu_savevm_state_header(f); + } cpu_synchronize_all_states(); QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { -- 1.8.3.1