Re: [Xen-devel] [PATCH for-4.11] x86/ioreq: Fix build from a collision of c/s f46b61973 and c/s 6e387461ed
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 GrallCheers, Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Wei Liu CC: Julien Grall CC: Paul Durrant CC: Juergen Gross --- 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@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH for-4.11] x86/ioreq: Fix build from a collision of c/s f46b61973 and c/s 6e387461ed
On 07/04/18 13:42, Paul Durrant wrote: >> -Original Message- >> From: Andrew Cooper [mailto:andrew.coop...@citrix.com] >> Sent: 06 April 2018 18:57 >> To: Xen-devel>> Cc: Andrew Cooper ; Jan Beulich >> ; Wei Liu ; Julien Grall >> ; Paul Durrant ; Juergen >> Gross >> 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 > > Reviewed-by: Paul Durrant Release-acked-by: Juergen Gross Juergen ___ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH for-4.11] x86/ioreq: Fix build from a collision of c/s f46b61973 and c/s 6e387461ed
> -Original Message- > From: Andrew Cooper [mailto:andrew.coop...@citrix.com] > Sent: 06 April 2018 18:57 > To: Xen-devel> Cc: Andrew Cooper ; Jan Beulich > ; Wei Liu ; Julien Grall > ; Paul Durrant ; Juergen > Gross > 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 Reviewed-by: Paul Durrant > --- > CC: Jan Beulich > CC: Wei Liu > CC: Julien Grall > CC: Paul Durrant > CC: Juergen Gross > --- > 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