> -----Original Message-----
> From: Andrew Cooper [mailto:andrew.coop...@citrix.com]
> Sent: 06 April 2018 18:57
> To: Xen-devel <xen-de...@lists.xen.org>
> Cc: Andrew Cooper <andrew.coop...@citrix.com>; Jan Beulich
> <jbeul...@suse.com>; Wei Liu <wei.l...@citrix.com>; Julien Grall
> <julien.gr...@arm.com>; Paul Durrant <paul.durr...@citrix.com>; Juergen
> Gross <jgr...@suse.com>
> Subject: [PATCH for-4.11] x86/ioreq: Fix build from a collision of c/s 
> f46b61973
> and c/s 6e387461ed
> 
> Drop the _mfn() wrappers now that page_to_mfn() returns the correct type.
> 
> Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>

Reviewed-by: Paul Durrant <paul.durr...@citrix.com>

> ---
> CC: Jan Beulich <jbeul...@suse.com>
> CC: Wei Liu <wei.l...@citrix.com>
> CC: Julien Grall <julien.gr...@arm.com>
> CC: Paul Durrant <paul.durr...@citrix.com>
> CC: Juergen Gross <jgr...@suse.com>
> ---
>  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;
> 
> --
> 2.1.4


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

Reply via email to