Re: [Qemu-devel] [PATCH 11/17] add argument ram_addr_t to hook_ram_load

["Michael R. Hines" <mrhines@linux.vnet.ibm.com>]

On 12/02/2013 05:19 PM, Lei Li wrote:
> Adds argument ram_addr_t to hook_ram_load, and replaces
> QEMURamHookFunc with QEMURamLoadHookFunc for it. With this
> new argument, it will allow cut almost half of the data
> transferred on the Unix socket using by page flipping
> migraton.
>
> Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
> ---
>   arch_init.c                   |    2 +-
>   include/migration/migration.h |    2 +-
>   include/migration/qemu-file.h |   11 ++++++++++-
>   migration-rdma.c              |    2 +-
>   savevm.c                      |    4 ++--
>   5 files changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/arch_init.c b/arch_init.c
> index daaa519..0621893 100644
> --- a/arch_init.c
> +++ b/arch_init.c
> @@ -945,7 +945,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
>                   goto done;
>               }
>           } else if (flags & RAM_SAVE_FLAG_HOOK) {
> -            ram_control_load_hook(f, flags);
> +            ram_control_load_hook(f, addr, flags);
>           }
>           error = qemu_file_get_error(f);
>           if (error) {
> diff --git a/include/migration/migration.h b/include/migration/migration.h
> index ca852a8..300e52c 100644
> --- a/include/migration/migration.h
> +++ b/include/migration/migration.h
> @@ -149,7 +149,7 @@ int64_t xbzrle_cache_resize(int64_t new_size);
>
>   void ram_control_before_iterate(QEMUFile *f, uint64_t flags);
>   void ram_control_after_iterate(QEMUFile *f, uint64_t flags);
> -void ram_control_load_hook(QEMUFile *f, uint64_t flags);
> +void ram_control_load_hook(QEMUFile *f, ram_addr_t addr, uint64_t flags);
>
>   /* Whenever this is found in the data stream, the flags
>    * will be passed to ram_control_load_hook in the incoming-migration
> diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h
> index 6646e89..176c2d9 100644
> --- a/include/migration/qemu-file.h
> +++ b/include/migration/qemu-file.h
> @@ -65,6 +65,15 @@ typedef ssize_t (QEMUFileWritevBufferFunc)(void *opaque, struct iovec *iov,
>   typedef int (QEMURamHookFunc)(QEMUFile *f, void *opaque, uint64_t flags);
>
>   /*
> + * This function provides load hook for RAM migration, allows
> + * override of where the RAM page is loaded (such as page
> + * flipping for example).
> + */
> +typedef int (QEMURamLoadHookFunc)(QEMUFile *f, void *opaque,
> +                                  ram_addr_t addr,
> +                                  uint64_t flags);
> +
> +/*
>    * Constants used by ram_control_* hooks
>    */
>   #define RAM_CONTROL_SETUP    0
> @@ -90,7 +99,7 @@ typedef struct QEMUFileOps {
>       QEMUFileWritevBufferFunc *writev_buffer;
>       QEMURamHookFunc *before_ram_iterate;
>       QEMURamHookFunc *after_ram_iterate;
> -    QEMURamHookFunc *hook_ram_load;
> +    QEMURamLoadHookFunc *hook_ram_load;
>       QEMURamSaveFunc *save_page;
>   } QEMUFileOps;
>
> diff --git a/migration-rdma.c b/migration-rdma.c
> index ae04de4..732ec1a 100644
> --- a/migration-rdma.c
> +++ b/migration-rdma.c
> @@ -2938,7 +2938,7 @@ err_rdma_dest_wait:
>    * Keep doing this until the source tells us to stop.
>    */
>   static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque,
> -                                         uint64_t flags)
> +                                         ram_addr_t offset, uint64_t flags)
>   {
>       RDMAControlHeader reg_resp = { .len = sizeof(RDMARegisterResult),
>                                  .type = RDMA_CONTROL_REGISTER_RESULT,
> diff --git a/savevm.c b/savevm.c
> index 137e74f..75e397c 100644
> --- a/savevm.c
> +++ b/savevm.c
> @@ -647,12 +647,12 @@ void ram_control_after_iterate(QEMUFile *f, uint64_t flags)
>       }
>   }
>
> -void ram_control_load_hook(QEMUFile *f, uint64_t flags)
> +void ram_control_load_hook(QEMUFile *f, ram_addr_t offset, uint64_t flags)
>   {
>       int ret = -EINVAL;
>
>       if (f->ops->hook_ram_load) {
> -        ret = f->ops->hook_ram_load(f, f->opaque, flags);
> +        ret = f->ops->hook_ram_load(f, f->opaque, offset, flags);
>           if (ret < 0) {
>               qemu_file_set_error(f, ret);
>           }
Reviewed-by: Michael R. Hines <mrhines@us.ibm.com>