Re: [Xen-devel] [PATCH 2/6] xenbus: Use grant-table wrapper functions

[Konrad Rzeszutek Wilk <konrad@xxxxxxxxxx>]

On Wed, Dec 14, 2011 at 03:12:10PM -0500, Daniel De Graaf wrote:
> For xenbus_{map,unmap}_ring to work on HVM, the grant table operations
> must be set up using the gnttab_set_{map,unmap}_op functions instead of
> directly populating the fields of gnttab_map_grant_ref. These functions
> simply populate the structure on paravirtualized Xen; however, on HVM
> they must call __pa() on vaddr when populating op->host_addr because the
> hypervisor cannot directly interpret guest-virtual addresses.

OK, this is a nice cleanup too.
> 
> Signed-off-by: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
> ---
>  drivers/xen/xenbus/xenbus_client.c |   17 +++++++----------
>  1 files changed, 7 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/xen/xenbus/xenbus_client.c 
> b/drivers/xen/xenbus/xenbus_client.c
> index ecd695d..8a23f1a 100644
> --- a/drivers/xen/xenbus/xenbus_client.c
> +++ b/drivers/xen/xenbus/xenbus_client.c
> @@ -545,12 +545,10 @@ EXPORT_SYMBOL_GPL(xenbus_map_ring_valloc);
>  int xenbus_map_ring(struct xenbus_device *dev, int gnt_ref,
>                   grant_handle_t *handle, void *vaddr)
>  {
> -     struct gnttab_map_grant_ref op = {
> -             .host_addr = (unsigned long)vaddr,
> -             .flags     = GNTMAP_host_map,
> -             .ref       = gnt_ref,
> -             .dom       = dev->otherend_id,
> -     };
> +     struct gnttab_map_grant_ref op;
> +
> +     gnttab_set_map_op(&op, (phys_addr_t)vaddr, GNTMAP_host_map, gnt_ref,
> +                       dev->otherend_id);
>  
>       if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
>               BUG();
> @@ -677,10 +675,9 @@ EXPORT_SYMBOL_GPL(xenbus_unmap_ring_vfree);
>  int xenbus_unmap_ring(struct xenbus_device *dev,
>                     grant_handle_t handle, void *vaddr)
>  {
> -     struct gnttab_unmap_grant_ref op = {
> -             .host_addr = (unsigned long)vaddr,
> -             .handle    = handle,
> -     };
> +     struct gnttab_unmap_grant_ref op;
> +
> +     gnttab_set_unmap_op(&op, (phys_addr_t)vaddr, GNTMAP_host_map, handle);

>  
>       if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1))
>               BUG();
> -- 
> 1.7.7.4
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxxxxxxxx
> http://lists.xensource.com/xen-devel

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel