From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VwQOK-00050l-28 for qemu-devel@nongnu.org; Fri, 27 Dec 2013 00:55:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VwQOA-0004gc-W9 for qemu-devel@nongnu.org; Fri, 27 Dec 2013 00:55:23 -0500 Received: from e39.co.us.ibm.com ([32.97.110.160]:51179) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VwQOA-0004gV-P0 for qemu-devel@nongnu.org; Fri, 27 Dec 2013 00:55:14 -0500 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 26 Dec 2013 22:55:11 -0700 Received: from b01cxnp23034.gho.pok.ibm.com (b01cxnp23034.gho.pok.ibm.com [9.57.198.29]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 26B7A38C8027 for ; Fri, 27 Dec 2013 00:55:06 -0500 (EST) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by b01cxnp23034.gho.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rBR5t8ql9830728 for ; Fri, 27 Dec 2013 05:55:08 GMT Received: from d01av01.pok.ibm.com (localhost [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rBR5t7FJ015550 for ; Fri, 27 Dec 2013 00:55:08 -0500 Message-ID: <52BD14A3.3020706@linux.vnet.ibm.com> Date: Fri, 27 Dec 2013 13:48:19 +0800 From: "Michael R. Hines" MIME-Version: 1.0 References: <1385975957-22941-1-git-send-email-lilei@linux.vnet.ibm.com> <1385975957-22941-8-git-send-email-lilei@linux.vnet.ibm.com> In-Reply-To: <1385975957-22941-8-git-send-email-lilei@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 07/17] save_page: replace block_offset with a MemoryRegion List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Lei Li Cc: aarcange@redhat.com, quintela@redhat.com, qemu-devel@nongnu.org, aliguori@amazon.com, lagarcia@br.ibm.com, pbonzini@redhat.com, rcj@linux.vnet.ibm.com On 12/02/2013 05:19 PM, Lei Li wrote: > 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 e0acbc5..daaa519 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 f9b104a..6646e89 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 3f912dd..06c1f29 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) { Reviewed-by: Michael R. Hines