From patchwork Thu Dec 29 01:25:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 133488 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A8B8BB6FC3 for ; Thu, 29 Dec 2011 13:15:57 +1100 (EST) Received: from localhost ([::1]:38244 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rg4lQ-0005ok-7y for incoming@patchwork.ozlabs.org; Wed, 28 Dec 2011 20:26:36 -0500 Received: from eggs.gnu.org ([140.186.70.92]:33885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rg4l5-0005Dm-P4 for qemu-devel@nongnu.org; Wed, 28 Dec 2011 20:26:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rg4kz-0004Iv-MX for qemu-devel@nongnu.org; Wed, 28 Dec 2011 20:26:15 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:42974) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rg4kz-0004Hw-0W for qemu-devel@nongnu.org; Wed, 28 Dec 2011 20:26:09 -0500 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 9F448875B8; Thu, 29 Dec 2011 10:26:01 +0900 (JST) Received: (nullmailer pid 15168 invoked by uid 1000); Thu, 29 Dec 2011 01:26:00 -0000 From: Isaku Yamahata To: kvm@vger.kernel.org, qemu-devel@nongnu.org Date: Thu, 29 Dec 2011 10:25:44 +0900 Message-Id: <16943c66779e6c958cddd41fc42fc17b2b7245d7.1325055139.git.yamahata@valinux.co.jp> X-Mailer: git-send-email 1.7.1.1 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: yamahata@valinux.co.jp, t.hirofuchi@aist.go.jp, satoshi.itoh@aist.go.jp Subject: [Qemu-devel] [PATCH 05/21] arch_init/ram_save_live: factor out RAM_SAVE_FLAG_MEM_SIZE case 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 | 21 ++++++++++++++------- migration.h | 1 + 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/arch_init.c b/arch_init.c index d55e39c..9bc313e 100644 --- a/arch_init.c +++ b/arch_init.c @@ -243,6 +243,19 @@ void sort_ram_list(void) g_free(blocks); } +void ram_save_live_mem_size(QEMUFile *f) +{ + RAMBlock *block; + + qemu_put_be64(f, ram_bytes_total() | RAM_SAVE_FLAG_MEM_SIZE); + + QLIST_FOREACH(block, &ram_list.blocks, next) { + qemu_put_byte(f, strlen(block->idstr)); + qemu_put_buffer(f, (uint8_t *)block->idstr, strlen(block->idstr)); + qemu_put_be64(f, block->length); + } +} + int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) { ram_addr_t addr; @@ -282,13 +295,7 @@ int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) /* Enable dirty memory tracking */ cpu_physical_memory_set_dirty_tracking(1); - qemu_put_be64(f, ram_bytes_total() | RAM_SAVE_FLAG_MEM_SIZE); - - QLIST_FOREACH(block, &ram_list.blocks, next) { - qemu_put_byte(f, strlen(block->idstr)); - qemu_put_buffer(f, (uint8_t *)block->idstr, strlen(block->idstr)); - qemu_put_be64(f, block->length); - } + ram_save_live_mem_size(f); } bytes_transferred_last = bytes_transferred; diff --git a/migration.h b/migration.h index e79a69b..cb4a2d5 100644 --- a/migration.h +++ b/migration.h @@ -80,6 +80,7 @@ uint64_t ram_bytes_total(void); void sort_ram_list(void); int ram_save_block(QEMUFile *f); +void ram_save_live_mem_size(QEMUFile *f); int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque); int ram_load(QEMUFile *f, void *opaque, int version_id);