Re: [Xen-devel] [PATCH] ia64: fix build breakage because of conflicting u64 guest handles

[ANNIE LI <annie.li@xxxxxxxxxx>]

On 2011-12-1 2:39, Konrad Rzeszutek Wilk wrote:
> On Wed, Nov 30, 2011 at 10:22:37AM -0800, Luck, Tony wrote:
> > include/xen/interface/xen.h:526: error: conflicting types for 
> > â__guest_handle_u64â
> > arch/ia64/include/asm/xen/interface.h:74: error: previous declaration of 
> > â__guest_handle_u64â was here
> >
> > Problem introduced by "xen/granttable: Introducing grant table V2 stucture"
> >
> > which added a new definition to include/xen/interface/xen.h for "u64".
> >
> > Fix: delete the ia64 arch specific definition.
> >
> > Signed-off-by: Tony Luck<tony.luck@xxxxxxxxx>
> > ---
> >
> > Can someone either fold this into the above patch, or add it to the
> > same tree that is feeding into linux-next - I saw the breakage in
> > today's "next-20111130" tag.  Thanks.
> Ah, I can fold it in. Thanks!
A definition for uint64_t already existing in 
arch/x86/include/asm/xen/interface.h, 58 line: 
DEFINE_GUEST_HANDLE(uint64_t);
Maybe it is better to remove the definition in 
include/xen/interface/xen.h of grant table v2 patch, and not change code 
of arch/ia64/include/asm/xen/interface.h.
Konrad, did you fold it already? or I revert the definition in my 
following sub-page and transitive patches?
Thanks
Annie
> >   arch/ia64/include/asm/xen/interface.h |    2 +-
> >   1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/ia64/include/asm/xen/interface.h 
> > b/arch/ia64/include/asm/xen/interface.h
> > index 1d2427d..fbb5198 100644
> > --- a/arch/ia64/include/asm/xen/interface.h
> > +++ b/arch/ia64/include/asm/xen/interface.h
> > @@ -71,7 +71,7 @@
> >   __DEFINE_GUEST_HANDLE(uchar, unsigned char);
> >   __DEFINE_GUEST_HANDLE(uint, unsigned int);
> >   __DEFINE_GUEST_HANDLE(ulong, unsigned long);
> > -__DEFINE_GUEST_HANDLE(u64, unsigned long);
> > +
> >   DEFINE_GUEST_HANDLE(char);
> >   DEFINE_GUEST_HANDLE(int);
> >   DEFINE_GUEST_HANDLE(long);
> > --
> > 1.7.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel