Re: [Xen-devel] [PATCH v1 1/8]: PVH basic and hader file changes

[Konrad Rzeszutek Wilk <konrad@xxxxxxxxxx>]

On Thu, Oct 4, 2012 at 6:00 AM, Ian Campbell <Ian.Campbell@xxxxxxxxxx> wrote:
> On Fri, 2012-09-21 at 20:15 +0100, Mukesh Rathor wrote:
>> @@ -234,4 +245,20 @@ DEFINE_GUEST_HANDLE_STRUCT(xen_memory_map);
>>   * during a driver critical region.
>>   */
>>  extern spinlock_t xen_reservation_lock;
>> +
>> +/*
>> + * Unmaps the page appearing at a particular GPFN from the specified
>> guest's
>> + * pseudophysical address space.
>> + * arg == addr of xen_remove_from_physmap_t.
>> + */
>> +#define XENMEM_remove_from_physmap      15
>> +struct xen_remove_from_physmap {
>> +    /* Which domain to change the mapping for. */
>> +    domid_t domid;
>> +
>> +    /* GPFN of the current mapping of the page. */
>> +    unsigned long     gpfn;
>> +};
>> +DEFINE_GUEST_HANDLE_STRUCT(xen_remove_from_physmap);
>
> I needed this fixup in a tree with both the ARM and PVH stuff:
>
> 8<------------------------------------
>
> >From d56a302734180171855e0ee07571ac0cee69b3e5 Mon Sep 17 00:00:00 2001
> From: Ian Campbell <ian.campbell@xxxxxxxxxx>
> Date: Thu, 4 Oct 2012 10:45:52 +0100
> Subject: [PATCH] xen: use xen_pft_t in struct xen_remove_from_physmap
>
> 4a6c2b4 "PVH basic and hader file changes" and bd3f79b "xen: Introduce
> xen_pfn_t for pfn and mfn types" passed like ships in the night.

.. and at least they did not collide with each other :-)
>
> Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> ---
>  include/xen/interface/memory.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/include/xen/interface/memory.h b/include/xen/interface/memory.h
> index 6d74c47..d38bdc1 100644
> --- a/include/xen/interface/memory.h
> +++ b/include/xen/interface/memory.h
> @@ -258,7 +258,7 @@ struct xen_remove_from_physmap {
>      domid_t domid;
>
>      /* GPFN of the current mapping of the page. */
> -    unsigned long     gpfn;
> +    xen_pfn_t gpfn;
>  };
>  DEFINE_GUEST_HANDLE_STRUCT(xen_remove_from_physmap);
>
> --
> 1.7.2.5
>
>
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxx
> http://lists.xen.org/xen-devel
>

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel