From patchwork Thu Jul 25 20:18:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lei Li X-Patchwork-Id: 261951 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6A6722C00ED for ; Fri, 26 Jul 2013 06:41:16 +1000 (EST) Received: from localhost ([::1]:51064 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2S2s-0002dB-5N for incoming@patchwork.ozlabs.org; Thu, 25 Jul 2013 16:21:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38222) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2S0Z-0008Tk-1M for qemu-devel@nongnu.org; Thu, 25 Jul 2013 16:19:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2S0Y-0005PR-4C for qemu-devel@nongnu.org; Thu, 25 Jul 2013 16:19:30 -0400 Received: from e28smtp09.in.ibm.com ([122.248.162.9]:52575) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2S0X-0005P5-Kd for qemu-devel@nongnu.org; Thu, 25 Jul 2013 16:19:30 -0400 Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 26 Jul 2013 01:44:09 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp09.in.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 26 Jul 2013 01:44:08 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id AEC7AE0054 for ; Fri, 26 Jul 2013 01:49:26 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r6PKJKCQ48038102 for ; Fri, 26 Jul 2013 01:49:20 +0530 Received: from d28av03.in.ibm.com (loopback [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r6PKJNKc017816 for ; Fri, 26 Jul 2013 06:19:23 +1000 Received: from localhost.localdomain ([9.77.180.160]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r6PKJ7cB016868; Fri, 26 Jul 2013 06:19:21 +1000 From: Lei Li To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2013 04:18:11 +0800 Message-Id: <1374783499-2550-5-git-send-email-lilei@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1374783499-2550-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1374783499-2550-1-git-send-email-lilei@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13072520-2674-0000-0000-000009F643CE X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.9 Cc: aarcange@redhat.com, aliguori@us.ibm.com, Lei Li , quintela@redhat.com, lagarcia@br.ibm.com, pbonzini@redhat.com, rcj@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 04/12] arch_init: introduce ram_page_save() 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: Lei Li --- arch_init.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/arch_init.c b/arch_init.c index a8b91ee..a418071 100644 --- a/arch_init.c +++ b/arch_init.c @@ -699,6 +699,64 @@ static uint64_t ram_save_pending(QEMUFile *f, void *opaque, uint64_t max_size) return remaining_size; } +/* This is the last block from where we have sent data for local migration */ +static RAMBlock *last_block_local; +static ram_addr_t last_offset_local; + +static int ram_page_save(QEMUFile *f) +{ + RAMBlock *block = last_block_local; + ram_addr_t offset = last_offset_local; + MemoryRegion *mr = block->mr; + int bytes_sent = 0; + + if (!block) { + block = QTAILQ_FIRST(&ram_list.blocks); + } + + do { + mr = block->mr; + uint8_t *p; + int cont = (block == last_block_local) ? RAM_SAVE_FLAG_CONTINUE : 0; + + p = memory_region_get_ram_ptr(mr) + offset; + + if (is_zero_page(p)) { + qemu_put_be64(f, offset | cont | RAM_SAVE_FLAG_COMPRESS); + if (!cont) { + qemu_put_byte(f, strlen(block->idstr)); + qemu_put_buffer(f, (uint8_t *)block->idstr, + strlen(block->idstr)); + } + qemu_put_byte(f, *p); + bytes_sent = 1; + } else { + qemu_put_be64(f, offset | cont | RAM_SAVE_FLAG_PAGE); + if (!cont) { + qemu_put_byte(f, strlen(block->idstr)); + qemu_put_buffer(f, (uint8_t *)block->idstr, + strlen(block->idstr)); + } + qemu_put_buffer(f, p, TARGET_PAGE_SIZE); + bytes_sent = TARGET_PAGE_SIZE; + } + + offset += TARGET_PAGE_SIZE; + if (offset >= block->length) { + offset = 0; + block = QTAILQ_NEXT(block, next); + if (!block) { + block = QTAILQ_FIRST(&ram_list.blocks); + } + } + } while (block != last_block_local || offset != last_offset_local); + + last_block_local = block; + last_offset_local = offset; + + return bytes_sent; +} + static int load_xbzrle(QEMUFile *f, ram_addr_t addr, void *host) { int ret, rc = 0;