From patchwork Tue Oct 30 08:33:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 195439 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F33792C00A5 for ; Tue, 30 Oct 2012 21:59:02 +1100 (EST) Received: from localhost ([::1]:48517 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TT7Hn-0006Wi-SQ for incoming@patchwork.ozlabs.org; Tue, 30 Oct 2012 04:34:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TT7GM-0004jW-QC for qemu-devel@nongnu.org; Tue, 30 Oct 2012 04:33:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TT7GD-0000ac-Ia for qemu-devel@nongnu.org; Tue, 30 Oct 2012 04:33:30 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:44749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TT7GD-0000Yh-2m for qemu-devel@nongnu.org; Tue, 30 Oct 2012 04:33:21 -0400 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 8F7CA181D0; Tue, 30 Oct 2012 17:33:14 +0900 (JST) Received: (nullmailer pid 29487 invoked by uid 1000); Tue, 30 Oct 2012 08:33:14 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org, kvm@vger.kernel.org Date: Tue, 30 Oct 2012 17:33:06 +0900 Message-Id: X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 210.128.90.3 Cc: benoit.hudzia@gmail.com, aarcange@redhat.com, aliguori@us.ibm.com, quintela@redhat.com, stefanha@gmail.com, t.hirofuchi@aist.go.jp, dlaor@redhat.com, satoshi.itoh@aist.go.jp, mdroth@linux.vnet.ibm.com, yoshikawa.takuya@oss.ntt.co.jp, owasserm@redhat.com, avi@redhat.com, pbonzini@redhat.com, chegu_vinod@hp.com Subject: [Qemu-devel] [PATCH v3 30/35] arch_init: factor out ram_load 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 Signed-off-by: Isaku Yamahata --- arch_init.c | 13 ++++++++++--- arch_init.h | 3 +++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/arch_init.c b/arch_init.c index 9137013..f86a0b4 100644 --- a/arch_init.c +++ b/arch_init.c @@ -867,7 +867,9 @@ int ram_load_page(QEMUFile *f, void *host, int flags) return 0; } -static int ram_load(QEMUFile *f, void *opaque, int version_id) +int ram_load(QEMUFile *f, void *opaque, int version_id, + void *(host_from_stream_offset_p)(QEMUFile *f, + ram_addr_t offsset, int flags)) { ram_addr_t addr; int flags, ret = 0; @@ -899,7 +901,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) if (flags & (RAM_SAVE_FLAG_COMPRESS | RAM_SAVE_FLAG_PAGE | RAM_SAVE_FLAG_XBZRLE)) { - host = host_from_stream_offset(f, addr, flags); + host = host_from_stream_offset_p(f, addr, flags); if (!host) { return -EINVAL; } @@ -922,6 +924,11 @@ done: return ret; } +static int ram_load_precopy(QEMUFile *f, void *opaque, int version_id) +{ + return ram_load(f, opaque, version_id, &host_from_stream_offset); +} + static void ram_save_set_params(const MigrationParams *params, void *opaque) { if (params->postcopy) { @@ -940,7 +947,7 @@ SaveVMHandlers savevm_ram_handlers = { .save_live_setup = ram_save_setup, .save_live_iterate = ram_save_iterate, .save_live_complete = ram_save_complete, - .load_state = ram_load, + .load_state = ram_load_precopy, .cancel = ram_migration_cancel, }; diff --git a/arch_init.h b/arch_init.h index 9165456..3977ca7 100644 --- a/arch_init.h +++ b/arch_init.h @@ -54,6 +54,9 @@ bool ram_save_page(QEMUFile *f, RAMBlock *block, ram_addr_t offset, bool last_stage); RAMBlock *ram_find_block(const char *id, uint8_t len); int ram_load_mem_size(QEMUFile *f, ram_addr_t total_ram_bytes); +int ram_load(QEMUFile *f, void *opaque, int version_id, + void *(host_from_stream_offset_p)(QEMUFile *f, + ram_addr_t offsset, int flags)); #endif #endif