From mboxrd@z Thu Jan 1 00:00:00 1970 From: Isaku Yamahata Subject: [PATCH 05/21] arch_init/ram_save_live: factor out RAM_SAVE_FLAG_MEM_SIZE case Date: Thu, 29 Dec 2011 10:25:44 +0900 Message-ID: <16943c66779e6c958cddd41fc42fc17b2b7245d7.1325055139.git.yamahata@valinux.co.jp> References: Cc: yamahata@valinux.co.jp, t.hirofuchi@aist.go.jp, satoshi.itoh@aist.go.jp To: kvm@vger.kernel.org, qemu-devel@nongnu.org Return-path: Received: from mail.valinux.co.jp ([210.128.90.3]:47807 "EHLO mail.valinux.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754687Ab1L2B0D (ORCPT ); Wed, 28 Dec 2011 20:26:03 -0500 In-Reply-To: In-Reply-To: References: Sender: kvm-owner@vger.kernel.org List-ID: 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); -- 1.7.1.1 From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Isaku Yamahata Date: Thu, 29 Dec 2011 10:25:44 +0900 Message-Id: <16943c66779e6c958cddd41fc42fc17b2b7245d7.1325055139.git.yamahata@valinux.co.jp> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 05/21] arch_init/ram_save_live: factor out RAM_SAVE_FLAG_MEM_SIZE case List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: yamahata@valinux.co.jp, t.hirofuchi@aist.go.jp, satoshi.itoh@aist.go.jp 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); -- 1.7.1.1