[Xen-devel,v4,1/3] Move xenstore and libxc public headers to include subdir

On Thu, 7 Aug 2014, Ian Jackson wrote:
> Stefano Stabellini writes ("Re: [Xen-devel] [PATCH v4 1/3] Move xenstore and libxc public headers to include subdir"):
> > I needed to make a couple of more libxc to libxc/include substitutions
> > under tools/ocaml.
> > The appended patch should work.
> > I have also pushed:
> > 
> > git://xenbits.xen.org/people/sstabellini/xen-unstable.git public_headers_v5
> 
> It seems that the 32-bit stubdom build is still broken:
> 
> In file included from xc_core.c:64:0:
> xg_private.h:30:21: fatal error: xenctrl.h: No such file or directory

Somehow I missed this email until today.

I modified the stubdom and mini-os Makefiles (below is the incremental
diff):




I have also pushed everything:

git://xenbits.xen.org/people/sstabellini/xen-unstable.git public_headers_v6

Stefano Stabellini writes ("Re: [Xen-devel] [PATCH v4 1/3] Move xenstore and libxc public headers to include subdir"):
> I have also pushed everything:
> 
> git://xenbits.xen.org/people/sstabellini/xen-unstable.git public_headers_v6

I rebased this (onto e01fa4e223fc077e18936d890dbd4813c3e7c9b1) and git
was a bit grumbly and said it had to do a 3-way merge.  After I did
that, my build still failed - see below.  The runes I use are:

  git-clean -xdff && cp ../.config .
  (./configure && make -j4 && echo ok.) 2>&1 | tee ../log
and my .config is:
  CONFIG_QEMU=/u/iwj/work/1/qemu-iwj.git
  QEMU_UPSTREAM_URL=/u/iwj/work/1/qemu-upstream-unstable.git
  OVMF_UPSTREAM_URL=/u/iwj/work/1/ovmf.git

Thanks,
Ian.

make[3]: Entering directory `/u/iwj/work/xen.git/tools/qemu-xen-traditional-dir'
/u/iwj/work/1/qemu-iwj.git/xen-hooks.mak:63: === pciutils-dev package not found - missing /usr/include/pci
/u/iwj/work/1/qemu-iwj.git/xen-hooks.mak:64: === PCI passthrough capability has been disabled
  CC    qemu-nbd.o
  CC    qemu-tool.o
  CC    osdep.o
  CC    cutils.o
In file included from ./config-host.h:20:0,
                 from /u/iwj/work/1/qemu-iwj.git/osdep.c:25:
/u/iwj/work/1/qemu-iwj.git/xen-config-host.h:19:21: fatal error: xenctrl.h: No such file or directory
compilation terminated.
In file included from ./config-host.h:20:0,
                 from /u/iwj/work/1/qemu-iwj.git/qemu-common.h:33,
                 from /u/iwj/work/1/qemu-iwj.git/qemu-nbd.c:20:
/u/iwj/work/1/qemu-iwj.git/xen-config-host.h:19:21: fatal error: xenctrl.h: No such file or directory
compilation terminated.
make[3]: *** [osdep.o] Error 1
make[3]: *** Waiting for unfinished jobs....
In file included from ./config-host.h:20:0,
                 from /u/iwj/work/1/qemu-iwj.git/qemu-common.h:33,
                 from /u/iwj/work/1/qemu-iwj.git/qemu-tool.c:14:
/u/iwj/work/1/qemu-iwj.git/xen-config-host.h:19:21: fatal error: xenctrl.h: No such file or directory
compilation terminated.
In file included from ./config-host.h:20:0,
                 from /u/iwj/work/1/qemu-iwj.git/qemu-common.h:33,
                 from /u/iwj/work/1/qemu-iwj.git/cutils.c:24:
/u/iwj/work/1/qemu-iwj.git/xen-config-host.h:19:21: fatal error: xenctrl.h: No such file or directory
compilation terminated.
make[3]: *** [qemu-nbd.o] Error 1
make[3]: *** [qemu-tool.o] Error 1
make[3]: *** [cutils.o] Error 1
make[3]: Leaving directory `/u/iwj/work/xen.git/tools/qemu-xen-traditional-dir'
make[2]: *** [subdir-install-qemu-xen-traditional-dir] Error 2
make[2]: Leaving directory `/u/iwj/work/xen.git/tools'
make[1]: *** [subdirs-install] Error 2
make[1]: Leaving directory `/u/iwj/work/xen.git/tools'
make: *** [install-tools] Error 2

On Mon, 2014-09-22 at 18:14 +0100, Ian Jackson wrote:
> Stefano Stabellini writes ("Re: [Xen-devel] [PATCH v4 1/3] Move xenstore and libxc public headers to include subdir"):
> > I have also pushed everything:
> > 
> > git://xenbits.xen.org/people/sstabellini/xen-unstable.git public_headers_v6
> 
> I rebased this (onto e01fa4e223fc077e18936d890dbd4813c3e7c9b1) and git
> was a bit grumbly and said it had to do a 3-way merge.  After I did
> that, my build still failed - see below. 

Looks like you've not applied the associated qemu-trad.git change to
qemu-iwj.git, patch #2 in this series. As noted in the coverletter they
should be applied together (with the corresponding Config.mk change
folded in here)

>  The runes I use are:
> 
>   git-clean -xdff && cp ../.config .
>   (./configure && make -j4 && echo ok.) 2>&1 | tee ../log
> and my .config is:
>   CONFIG_QEMU=/u/iwj/work/1/qemu-iwj.git
>   QEMU_UPSTREAM_URL=/u/iwj/work/1/qemu-upstream-unstable.git
>   OVMF_UPSTREAM_URL=/u/iwj/work/1/ovmf.git
> 
> Thanks,
> Ian.
> 
> make[3]: Entering directory `/u/iwj/work/xen.git/tools/qemu-xen-traditional-dir'
> /u/iwj/work/1/qemu-iwj.git/xen-hooks.mak:63: === pciutils-dev package not found - missing /usr/include/pci
> /u/iwj/work/1/qemu-iwj.git/xen-hooks.mak:64: === PCI passthrough capability has been disabled
>   CC    qemu-nbd.o
>   CC    qemu-tool.o
>   CC    osdep.o
>   CC    cutils.o
> In file included from ./config-host.h:20:0,
>                  from /u/iwj/work/1/qemu-iwj.git/osdep.c:25:
> /u/iwj/work/1/qemu-iwj.git/xen-config-host.h:19:21: fatal error: xenctrl.h: No such file or directory
> compilation terminated.
> In file included from ./config-host.h:20:0,
>                  from /u/iwj/work/1/qemu-iwj.git/qemu-common.h:33,
>                  from /u/iwj/work/1/qemu-iwj.git/qemu-nbd.c:20:
> /u/iwj/work/1/qemu-iwj.git/xen-config-host.h:19:21: fatal error: xenctrl.h: No such file or directory
> compilation terminated.
> make[3]: *** [osdep.o] Error 1
> make[3]: *** Waiting for unfinished jobs....
> In file included from ./config-host.h:20:0,
>                  from /u/iwj/work/1/qemu-iwj.git/qemu-common.h:33,
>                  from /u/iwj/work/1/qemu-iwj.git/qemu-tool.c:14:
> /u/iwj/work/1/qemu-iwj.git/xen-config-host.h:19:21: fatal error: xenctrl.h: No such file or directory
> compilation terminated.
> In file included from ./config-host.h:20:0,
>                  from /u/iwj/work/1/qemu-iwj.git/qemu-common.h:33,
>                  from /u/iwj/work/1/qemu-iwj.git/cutils.c:24:
> /u/iwj/work/1/qemu-iwj.git/xen-config-host.h:19:21: fatal error: xenctrl.h: No such file or directory
> compilation terminated.
> make[3]: *** [qemu-nbd.o] Error 1
> make[3]: *** [qemu-tool.o] Error 1
> make[3]: *** [cutils.o] Error 1
> make[3]: Leaving directory `/u/iwj/work/xen.git/tools/qemu-xen-traditional-dir'
> make[2]: *** [subdir-install-qemu-xen-traditional-dir] Error 2
> make[2]: Leaving directory `/u/iwj/work/xen.git/tools'
> make[1]: *** [subdirs-install] Error 2
> make[1]: Leaving directory `/u/iwj/work/xen.git/tools'
> make: *** [install-tools] Error 2

Ian Campbell writes ("Re: [Xen-devel] [PATCH v4 1/3] Move xenstore and libxc public headers to include subdir"):
> Looks like you've not applied the associated qemu-trad.git change to
> qemu-iwj.git, patch #2 in this series. As noted in the coverletter they
> should be applied together (with the corresponding Config.mk change
> folded in here)

You were right.  I have now applied 1/3 and 2/3 together.  (That is, I
have applied 2/3 to qemu trad, and amended 1/3 to contain also a
Config.mk update to mention the new qemu commit.)

I'm about to push 3/3.

Thanks,
Ian.

On Tue, 23 Sep 2014, Ian Jackson wrote:
> Ian Campbell writes ("Re: [Xen-devel] [PATCH v4 1/3] Move xenstore and libxc public headers to include subdir"):
> > Looks like you've not applied the associated qemu-trad.git change to
> > qemu-iwj.git, patch #2 in this series. As noted in the coverletter they
> > should be applied together (with the corresponding Config.mk change
> > folded in here)
> 
> You were right.  I have now applied 1/3 and 2/3 together.  (That is, I
> have applied 2/3 to qemu trad, and amended 1/3 to contain also a
> Config.mk update to mention the new qemu commit.)
> 
> I'm about to push 3/3.

Thanks!