From patchwork Thu Feb 12 22:03:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 439339 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C55CD140151 for ; Fri, 13 Feb 2015 09:04:10 +1100 (AEDT) Received: from localhost ([::1]:52313 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YM1rk-0008Qx-UW for incoming@patchwork.ozlabs.org; Thu, 12 Feb 2015 17:04:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38187) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YM1r2-0007Bt-BH for qemu-devel@nongnu.org; Thu, 12 Feb 2015 17:03:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YM1qv-00024G-RC for qemu-devel@nongnu.org; Thu, 12 Feb 2015 17:03:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58676) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YM1qv-00023n-KS for qemu-devel@nongnu.org; Thu, 12 Feb 2015 17:03:17 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t1CM3FV4004511 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 12 Feb 2015 17:03:16 -0500 Received: from trasno.mitica (ovpn-116-20.ams2.redhat.com [10.36.116.20]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t1CM3CUa023481; Thu, 12 Feb 2015 17:03:14 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 12 Feb 2015 23:03:06 +0100 Message-Id: <1423778591-12590-2-git-send-email-quintela@redhat.com> In-Reply-To: <1423778591-12590-1-git-send-email-quintela@redhat.com> References: <1423778591-12590-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: liang.z.li@intel.com Subject: [Qemu-devel] [PATCH 1/6] ram: make all save_page functions take a uint64_t parameter 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 It used to be an int, but then we can't pass directly the bytes_transferred parameter, that would happen later in the series. Signed-off-by: Juan Quintela Reviewed-by: Amit Shah --- arch_init.c | 11 ++++++++--- include/migration/migration.h | 2 +- include/migration/qemu-file.h | 2 +- migration/qemu-file.c | 3 ++- migration/rdma.c | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/arch_init.c b/arch_init.c index 89c8fa4..0066cf5 100644 --- a/arch_init.c +++ b/arch_init.c @@ -580,6 +580,7 @@ static int ram_save_page(QEMUFile *f, RAMBlock* block, ram_addr_t offset, bool last_stage) { int bytes_sent; + uint64_t bytes_xmit; int cont; ram_addr_t current_addr; MemoryRegion *mr = block->mr; @@ -593,17 +594,21 @@ static int ram_save_page(QEMUFile *f, RAMBlock* block, ram_addr_t offset, /* In doubt sent page as normal */ bytes_sent = -1; + bytes_xmit = 0; ret = ram_control_save_page(f, block->offset, - offset, TARGET_PAGE_SIZE, &bytes_sent); + offset, TARGET_PAGE_SIZE, &bytes_xmit); + if (bytes_xmit) { + bytes_sent = bytes_xmit; + } XBZRLE_cache_lock(); current_addr = block->offset + offset; if (ret != RAM_SAVE_CONTROL_NOT_SUPP) { if (ret != RAM_SAVE_CONTROL_DELAYED) { - if (bytes_sent > 0) { + if (bytes_xmit > 0) { acct_info.norm_pages++; - } else if (bytes_sent == 0) { + } else if (bytes_xmit == 0) { acct_info.dup_pages++; } } diff --git a/include/migration/migration.h b/include/migration/migration.h index f37348b..bb3b1b3 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -173,6 +173,6 @@ void ram_control_load_hook(QEMUFile *f, uint64_t flags); size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset, ram_addr_t offset, size_t size, - int *bytes_sent); + uint64_t *bytes_sent); #endif diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h index a923cec..94a8c97 100644 --- a/include/migration/qemu-file.h +++ b/include/migration/qemu-file.h @@ -82,7 +82,7 @@ typedef size_t (QEMURamSaveFunc)(QEMUFile *f, void *opaque, ram_addr_t block_offset, ram_addr_t offset, size_t size, - int *bytes_sent); + uint64_t *bytes_sent); /* * Stop any read or write (depending on flags) on the underlying diff --git a/migration/qemu-file.c b/migration/qemu-file.c index e66e557..1a4f986 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -161,7 +161,8 @@ void ram_control_load_hook(QEMUFile *f, uint64_t flags) } size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset, - ram_addr_t offset, size_t size, int *bytes_sent) + ram_addr_t offset, size_t size, + uint64_t *bytes_sent) { if (f->ops->save_page) { int ret = f->ops->save_page(f, f->opaque, block_offset, diff --git a/migration/rdma.c b/migration/rdma.c index 6bee30c..93f3e5c 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -2656,7 +2656,7 @@ static int qemu_rdma_close(void *opaque) */ static size_t qemu_rdma_save_page(QEMUFile *f, void *opaque, ram_addr_t block_offset, ram_addr_t offset, - size_t size, int *bytes_sent) + size_t size, uint64_t *bytes_sent) { QEMUFileRDMA *rfile = opaque; RDMAContext *rdma = rfile->rdma;