Re: [Xen-devel] [PATCH 3/3] Use the new include subdirectories to build Xen tools

[Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>]

On Thu, 10 Jul 2014, Ian Campbell wrote:
> On Thu, 2014-07-10 at 17:16 +0100, Stefano Stabellini wrote:
> > Use them to build qemu-xen.
> > 
> > Add them to the include path of CFLAGS_libxenguest, CFLAGS_libxenctrl
> > and CFLAGS_libxenstore.
> > 
> > Use CFLAGS_libxenctrl and CFLAGS_libxenstore to build the python tools.
> 
> All of these should be included in the patches which do the moves,
> otherwise you break bisectability.

I'll send out a single big patch.


> and I think you can drop -I$(XEN_XENSTORE) -I$(XEN_LIBXC) etc since
> those are supposed to be xenstore-internal headers, which oughtn't to be
> used even by intree users of the library.
> 
> If doing that breaks the build we should look at why.

It does break the build.
If we want to go down that path, we need to move xc_dom.h to
libxc/include too. But then should we install it too?

After that we still need to fix:

tools/misc/xen-mfndump.c includes xc_private.h, xc_core.h and
xg_save_restore.h.

tools/misc/xen-hptool.c includes xc_private.h and xc_core.h

tools/xcutils/readnotes.c includes xg_private.h and xc_dom.h

tools/blktap2/drivers/block-log.c includes xc_bitops.h

tools/xenpaging/file_ops.c includes xc_private.h

tools/xenpaging/xenpaging.c includes xc_bitops.h


I could add I$(XEN_XENSTORE) and/or -I$(XEN_LIBXC) to the build line of
these specific programs and avoid adding them to CFLAGS_libxenctrl and
CFLAGS_libxenstore.


> 
> > diff --git a/tools/python/Makefile b/tools/python/Makefile
> > index eee746d..7c4b281 100644
> > --- a/tools/python/Makefile
> > +++ b/tools/python/Makefile
> > @@ -5,6 +5,8 @@ include $(XEN_ROOT)/tools/Rules.mk
> >  all: build
> >  
> >  XENPATH = "xen/util/path.py"
> > +CFLAGS += $(CFLAGS_libxenctrl)
> > +CFLAGS += $(CFLAGS_libxenstore)
> 
> You should be modifying tools/python/setup.py to change include_dirs for
> the various modules instead of this.

That works.

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