Re: [Xen-devel] [PATCH for-4.11] x86/ioreq: Fix build from a collision of c/s f46b61973 and c/s 6e387461ed

[Julien Grall <julien.grall@xxxxxxx>]

Hi,

On 06/04/18 18:57, Andrew Cooper wrote:
> Drop the _mfn() wrappers now that page_to_mfn() returns the correct type.
Sorry for the breakage:

Acked-by: Julien Grall <julien.grall@xxxxxxx>

Cheers,

> Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
> ---
> CC: Jan Beulich <JBeulich@xxxxxxxx>
> CC: Wei Liu <wei.liu2@xxxxxxxxxx>
> CC: Julien Grall <julien.grall@xxxxxxx>
> CC: Paul Durrant <paul.durrant@xxxxxxxxxx>
> CC: Juergen Gross <jgross@xxxxxxxx>
> ---
>   xen/arch/x86/hvm/ioreq.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/xen/arch/x86/hvm/ioreq.c b/xen/arch/x86/hvm/ioreq.c
> index 3a201f5..9051329 100644
> --- a/xen/arch/x86/hvm/ioreq.c
> +++ b/xen/arch/x86/hvm/ioreq.c
> @@ -973,12 +973,12 @@ int hvm_get_ioreq_server_frame(struct domain *d, 
> ioservid_t id,
>           if ( !HANDLE_BUFIOREQ(s) )
>               goto out;
>   
> -        *mfn = _mfn(page_to_mfn(s->bufioreq.page));
> +        *mfn = page_to_mfn(s->bufioreq.page);
>           rc = 0;
>           break;
>   
>       case XENMEM_resource_ioreq_server_frame_ioreq(0):
> -        *mfn = _mfn(page_to_mfn(s->ioreq.page));
> +        *mfn = page_to_mfn(s->ioreq.page);
>           rc = 0;
>           break;
>   
--
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel