From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52664) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sh0c0-0001Oj-Ou for qemu-devel@nongnu.org; Tue, 19 Jun 2012 11:45:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sh0bu-0005He-Fn for qemu-devel@nongnu.org; Tue, 19 Jun 2012 11:45:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25405) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sh0bu-0005HF-7t for qemu-devel@nongnu.org; Tue, 19 Jun 2012 11:44:54 -0400 From: Orit Wasserman Date: Tue, 19 Jun 2012 18:43:16 +0300 Message-Id: <1340120601-24747-9-git-send-email-owasserm@redhat.com> In-Reply-To: <1340120601-24747-1-git-send-email-owasserm@redhat.com> References: <1340120601-24747-1-git-send-email-owasserm@redhat.com> Subject: [Qemu-devel] [PATCH v12 08/13] Change ram_save_block to return -1 if there are no more changes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, quintela@redhat.com, stefanha@gmail.com, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, Orit Wasserman , chegu_vinod@hp.com, avi@redhat.com, pbonzini@redhat.com, eblake@redhat.com It will return 0 if the page is unmodifed. Signed-off-by: Orit Wasserman --- arch_init.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/arch_init.c b/arch_init.c index fbed5ea..c9ab66a 100644 --- a/arch_init.c +++ b/arch_init.c @@ -184,11 +184,11 @@ static void save_block_hdr(QEMUFile *f, RAMBlock *block, ram_addr_t offset, static RAMBlock *last_block; static ram_addr_t last_offset; -static int ram_save_block(QEMUFile *f) +static int ram_save_block(QEMUFile *f, int stage) { RAMBlock *block = last_block; ram_addr_t offset = last_offset; - int bytes_sent = 0; + int bytes_sent = -1; MemoryRegion *mr; if (!block) @@ -353,9 +353,12 @@ int ram_save_live(QEMUFile *f, int stage, void *opaque) while ((ret = qemu_file_rate_limit(f)) == 0) { int bytes_sent; - bytes_sent = ram_save_block(f); - bytes_transferred += bytes_sent; - if (bytes_sent == 0) { /* no more blocks */ + bytes_sent = ram_save_block(f, stage); + /* bytes_sent 0 represent unchanged page, + bytes_sent -1 represent no more blocks*/ + if (bytes_sent > 0) { + bytes_transferred += bytes_sent; + } else if (bytes_sent == -1) { /* no more blocks */ break; } } @@ -378,7 +381,7 @@ int ram_save_live(QEMUFile *f, int stage, void *opaque) int bytes_sent; /* flush all remaining blocks regardless of rate limiting */ - while ((bytes_sent = ram_save_block(f)) != 0) { + while ((bytes_sent = ram_save_block(f, stage)) != -1) { bytes_transferred += bytes_sent; } memory_global_dirty_log_stop(); -- 1.7.7.6