Re: [Xen-devel] [PATCH 1/3] move xenstore public headers to include subdir

[Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>]

On Thu, 10 Jul 2014, Ian Campbell wrote:
> On Thu, 2014-07-10 at 17:36 +0100, Stefano Stabellini wrote:
> > On Thu, 10 Jul 2014, Ian Campbell wrote:
> > > On Thu, 2014-07-10 at 17:27 +0100, Stefano Stabellini wrote:
> > > > On Thu, 10 Jul 2014, Ian Campbell wrote:
> > > > > On Thu, 2014-07-10 at 17:15 +0100, Stefano Stabellini wrote:
> > > > > > Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> > > > > > ---
> > > > > >  tools/xenstore/Makefile                |    9 +-
> > > > > >  tools/xenstore/compat/xs.h             |    2 -
> > > > > >  tools/xenstore/compat/xs_lib.h         |    2 -
> > > > > >  tools/xenstore/include/compat/xs.h     |    2 +
> > > > > >  tools/xenstore/include/compat/xs_lib.h |    2 +
> > > > > >  tools/xenstore/include/xenstore.h      |  257 
> > > > > > ++++++++++++++++++++++++++++++++
> > > > > >  tools/xenstore/include/xenstore_lib.h  |   85 +++++++++++
> > > > > >  tools/xenstore/xenstore.h              |  257 
> > > > > > --------------------------------
> > > > > >  tools/xenstore/xenstore_lib.h          |   85 -----------
> > > > > 
> > > > > Please can you use "git format-patch -M" so the renames are clear.
> > > > > 
> > > > > >  9 files changed, 351 insertions(+), 350 deletions(-)
> > > > > >  delete mode 100644 tools/xenstore/compat/xs.h
> > > > > >  delete mode 100644 tools/xenstore/compat/xs_lib.h
> > > > > >  create mode 100644 tools/xenstore/include/compat/xs.h
> > > > > >  create mode 100644 tools/xenstore/include/compat/xs_lib.h
> > > > > >  create mode 100644 tools/xenstore/include/xenstore.h
> > > > > >  create mode 100644 tools/xenstore/include/xenstore_lib.h
> > > > > >  delete mode 100644 tools/xenstore/xenstore.h
> > > > > >  delete mode 100644 tools/xenstore/xenstore_lib.h
> > > > > > 
> > > > > > diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
> > > > > > index e34bd41..2947d3e 100644
> > > > > > --- a/tools/xenstore/Makefile
> > > > > > +++ b/tools/xenstore/Makefile
> > > > > > @@ -6,6 +6,7 @@ MINOR = 3
> > > > > >  
> > > > > >  CFLAGS += -Werror
> > > > > >  CFLAGS += -I.
> > > > > > +CFLAGS += -I./include
> > > > > 
> > > > > Since you don't change any other Makefiles how do the in-tree 
> > > > > consumers
> > > > > of this library continue to build?
> > > > > 
> > > > > (probably using /usr/include/xenstore_lib.h)
> > > > 
> > > > They don't: the series is not bisectable in the current form (I wrote it
> > > > in patch #0).
> > > > I was thinking of getting some reviews and then send the whole series as
> > > > a single patch.
> > > 
> > > Ah OK, sorry for missing that bit.
> > 
> > The problem remains for the Makefile of qemu-xen-traditional though. I
> > have to make that change separately.
> 
> Don't you (or Ian) push to qemu-trad first and then update Config.mk at
> the same time as everything else?

Yes, that would work. Ian needs to keep that in mind when applying this.
I'll add a note to the commit message so that we don't forget.

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