From patchwork Wed Nov 6 13:29:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lei Li X-Patchwork-Id: 288907 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 6EB132C0091 for ; Thu, 7 Nov 2013 00:30:16 +1100 (EST) Received: from localhost ([::1]:34027 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ve3BW-0002qH-2l for incoming@patchwork.ozlabs.org; Wed, 06 Nov 2013 08:30:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ve3Aw-0002e1-JS for qemu-devel@nongnu.org; Wed, 06 Nov 2013 08:29:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ve3An-0007MI-4E for qemu-devel@nongnu.org; Wed, 06 Nov 2013 08:29:38 -0500 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:58331) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ve3Am-0007LR-HO for qemu-devel@nongnu.org; Wed, 06 Nov 2013 08:29:29 -0500 Received: from /spool/local by e28smtp06.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 6 Nov 2013 18:59:20 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp06.in.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 6 Nov 2013 18:59:19 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 4EAEF1258056 for ; Wed, 6 Nov 2013 19:00:02 +0530 (IST) Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rA6DTCbV40566810 for ; Wed, 6 Nov 2013 18:59:12 +0530 Received: from d28av05.in.ibm.com (localhost [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rA6DTHZh004249 for ; Wed, 6 Nov 2013 18:59:17 +0530 Received: from localhost.localdomain ([9.77.183.139]) by d28av05.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id rA6DTFme004190; Wed, 6 Nov 2013 18:59:16 +0530 From: Lei Li To: qemu-devel@nongnu.org Date: Wed, 6 Nov 2013 21:29:12 +0800 Message-Id: <1383744552-24937-1-git-send-email-lilei@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.7.6 X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13110613-9574-0000-0000-00000A74EA03 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.6 Cc: pbonzini@redhat.com, Lei Li , aliguori@amazon.com, mrhines@linux.vnet.ibm.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH resend] save_page: replace block_offset with a MemoryRegion 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 This patch exports MemoryRegion to save_page hook, replacing argument ram_addr_t block_offset with a MemoryRegion suggested by Paolo Bonzini. Signed-off-by: Lei Li --- arch_init.c | 4 ++-- include/migration/migration.h | 2 +- include/migration/qemu-file.h | 8 ++++---- migration-rdma.c | 4 ++-- savevm.c | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch_init.c b/arch_init.c index 7545d96..a9b97be 100644 --- a/arch_init.c +++ b/arch_init.c @@ -485,8 +485,8 @@ static int ram_save_block(QEMUFile *f, bool last_stage) /* In doubt sent page as normal */ bytes_sent = -1; - ret = ram_control_save_page(f, block->offset, - offset, TARGET_PAGE_SIZE, &bytes_sent); + ret = ram_control_save_page(f, mr, offset, TARGET_PAGE_SIZE, + &bytes_sent); if (ret != RAM_SAVE_CONTROL_NOT_SUPP) { if (ret != RAM_SAVE_CONTROL_DELAYED) { diff --git a/include/migration/migration.h b/include/migration/migration.h index 7e5d01a..ca852a8 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -161,7 +161,7 @@ void ram_control_load_hook(QEMUFile *f, uint64_t flags); #define RAM_SAVE_CONTROL_NOT_SUPP -1000 #define RAM_SAVE_CONTROL_DELAYED -2000 -size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset, +size_t ram_control_save_page(QEMUFile *f, MemoryRegion *mr, ram_addr_t offset, size_t size, int *bytes_sent); diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h index 0f757fb..d73dc4b 100644 --- a/include/migration/qemu-file.h +++ b/include/migration/qemu-file.h @@ -77,10 +77,10 @@ typedef int (QEMURamHookFunc)(QEMUFile *f, void *opaque, uint64_t flags); * is saved (such as RDMA, for example.) */ typedef size_t (QEMURamSaveFunc)(QEMUFile *f, void *opaque, - ram_addr_t block_offset, - ram_addr_t offset, - size_t size, - int *bytes_sent); + MemoryRegion *mr, + ram_addr_t offset, + size_t size, + int *bytes_sent); typedef struct QEMUFileOps { QEMUFilePutBufferFunc *put_buffer; diff --git a/migration-rdma.c b/migration-rdma.c index f94f3b4..ae04de4 100644 --- a/migration-rdma.c +++ b/migration-rdma.c @@ -2699,7 +2699,7 @@ static int qemu_rdma_close(void *opaque) * the protocol because most transfers are sent asynchronously. */ static size_t qemu_rdma_save_page(QEMUFile *f, void *opaque, - ram_addr_t block_offset, ram_addr_t offset, + MemoryRegion *mr, ram_addr_t offset, size_t size, int *bytes_sent) { QEMUFileRDMA *rfile = opaque; @@ -2716,7 +2716,7 @@ static size_t qemu_rdma_save_page(QEMUFile *f, void *opaque, * is full, or the page doen't belong to the current chunk, * an actual RDMA write will occur and a new chunk will be formed. */ - ret = qemu_rdma_write(f, rdma, block_offset, offset, size); + ret = qemu_rdma_write(f, rdma, mr->ram_addr, offset, size); if (ret < 0) { fprintf(stderr, "rdma migration: write error! %d\n", ret); goto err; diff --git a/savevm.c b/savevm.c index 2f631d4..3ee256e 100644 --- a/savevm.c +++ b/savevm.c @@ -661,12 +661,12 @@ 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) +size_t ram_control_save_page(QEMUFile *f, MemoryRegion *mr, ram_addr_t offset, + size_t size, int *bytes_sent) { if (f->ops->save_page) { - int ret = f->ops->save_page(f, f->opaque, block_offset, - offset, size, bytes_sent); + int ret = f->ops->save_page(f, f->opaque, mr, offset, + size, bytes_sent); if (ret != RAM_SAVE_CONTROL_DELAYED) { if (bytes_sent && *bytes_sent > 0) {