From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFmT3-0005Ej-MQ for qemu-devel@nongnu.org; Wed, 02 Dec 2009 05:29:53 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFmSy-0005Dn-O0 for qemu-devel@nongnu.org; Wed, 02 Dec 2009 05:29:52 -0500 Received: from [199.232.76.173] (port=35356 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFmSy-0005Dk-FZ for qemu-devel@nongnu.org; Wed, 02 Dec 2009 05:29:48 -0500 Received: from thoth.sbs.de ([192.35.17.2]:19840) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NFmSy-0004LC-7a for qemu-devel@nongnu.org; Wed, 02 Dec 2009 05:29:48 -0500 Message-ID: <4B164192.9090400@siemens.com> Date: Wed, 02 Dec 2009 11:29:38 +0100 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] ram migration: Properly reset statistics List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel As we may do more than one migration (cancellation, live backup), reset bytes_transferred on stage 1. Signed-off-by: Jan Kiszka --- vl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/vl.c b/vl.c index dbf1180..dc62c68 100644 --- a/vl.c +++ b/vl.c @@ -2896,7 +2896,7 @@ static int ram_save_block(QEMUFile *f) return found; } -static uint64_t bytes_transferred = 0; +static uint64_t bytes_transferred; static ram_addr_t ram_save_remaining(void) { @@ -2944,6 +2944,8 @@ static int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) } if (stage == 1) { + bytes_transferred = 0; + /* Make sure all dirty bits are set */ for (addr = 0; addr < last_ram_offset; addr += TARGET_PAGE_SIZE) { if (!cpu_physical_memory_get_dirty(addr, MIGRATION_DIRTY_FLAG))