Re: [Xen-devel] [PATCH v2 4/6] tools/libxc: Introduce ARRAY_SIZE() and replace handrolled examples

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Tue, 2014-06-10 at 13:53 +0100, Andrew Cooper wrote:
> On 10/06/14 13:40, Ian Campbell wrote:
> > On Mon, 2014-06-09 at 16:41 +0100, Andrew Cooper wrote:
> >> The conditional test is needed because xc_private.h is included into minios
> >> for stubdomains, where ARRAY_SIZE is already defined.
> >>
> >> Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
> >> CC: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
> >> CC: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
> >>
> >> --
> >> v2: Find more areas of the codebase which are poking at libxc private 
> >> internals
> >> ---
> >>  tools/libxc/xc_dom_arm.c |    2 +-
> >>  tools/libxc/xc_dom_x86.c |    4 ++--
> >>  tools/libxc/xc_minios.c  |    2 +-
> >>  tools/libxc/xc_private.h |    4 ++++
> >>  tools/misc/xen-hptool.c  |    2 --
> >>  tools/misc/xen-mfndump.c |    2 --
> > Not tools/misc/xenpm.c too?
> 
> No - xenpm.c is well behaved and doesn't use private headers.  (and I
> discovered this by ripping them all out and xenpm failed to compile)

Aha!

> >  Or if not perhaps
> >    #undef ARRAY_SIZE /* We shouldn't be including xc_private.h */
> > in those so that an eventual removal of xc_private from them isn't
> > blocked? (I think I slightly prefer the second option)
> 
> This is my preferred option.

Works for me then, thanks.

(FYI if you are planning to I have queued patch 1-3 and 5 for applying)

Ian.


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