Now that xenstore is in the mainline and xenstored.h is part of the API to xenlinux, should xenstored.h be moved into xen/include/public instead of being mkbuildtree''d from tools/xenstore to drivers/xen/xenbus? _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
On Mon, 12 Sep 2005, Magenheimer, Dan (HP Labs Fort Collins) wrote:> Now that xenstore is in the mainline and xenstored.h is > part of the API to xenlinux, should xenstored.h be > moved into xen/include/public instead of being > mkbuildtree''d from tools/xenstore to drivers/xen/xenbus?Won''t that make it impossible to build xenolinux kernels outside of the Xen tree - say, kernel RPMs ? -- All Rights Reversed _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Currently, there are many files in xen/include/public that are necessary to build xenlinux. The mkbuildtree process moves (links?) them to linux/include/asm-xen/xen-public prior to building linux. I assume once the API churn settles down, there will need to be some kind of extra version control to ensure that these stay sync''d.> -----Original Message----- > From: Rik van Riel [mailto:riel@redhat.com] > Sent: Monday, September 12, 2005 1:29 PM > To: Magenheimer, Dan (HP Labs Fort Collins) > Cc: xen-devel@lists.xensource.com > Subject: Re: [Xen-devel] xenstored.h > > On Mon, 12 Sep 2005, Magenheimer, Dan (HP Labs Fort Collins) wrote: > > > Now that xenstore is in the mainline and xenstored.h is > > part of the API to xenlinux, should xenstored.h be > > moved into xen/include/public instead of being > > mkbuildtree''d from tools/xenstore to drivers/xen/xenbus? > > Won''t that make it impossible to build xenolinux kernels > outside of the Xen tree - say, kernel RPMs ? > > -- > All Rights Reversed >_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
On 9/12/05, Rik van Riel <riel@redhat.com> wrote:> On Mon, 12 Sep 2005, Magenheimer, Dan (HP Labs Fort Collins) wrote: > > > Now that xenstore is in the mainline and xenstored.h is > > part of the API to xenlinux, should xenstored.h be > > moved into xen/include/public instead of being > > mkbuildtree''d from tools/xenstore to drivers/xen/xenbus? > > Won''t that make it impossible to build xenolinux kernels > outside of the Xen tree - say, kernel RPMs ?Yeah, you need to include those in your source RPMs - or have some kind of xen-headers RPM which you''d then require to build kernels... As Dan pointed out, the same applies for the other files in xen/include/public... christian _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
* Magenheimer, Dan (HP Labs Fort Collins) (dan.magenheimer@hp.com) wrote:> Now that xenstore is in the mainline and xenstored.h is > part of the API to xenlinux, should xenstored.h be > moved into xen/include/public instead of being > mkbuildtree''d from tools/xenstore to drivers/xen/xenbus?That''s basically what my original patch did. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
> From: Chris Wright [mailto:chrisw@osdl.org] > (dan.magenheimer@hp.com) wrote: > > Now that xenstore is in the mainline and xenstored.h is > > part of the API to xenlinux, should xenstored.h be > > moved into xen/include/public instead of being > > mkbuildtree''d from tools/xenstore to drivers/xen/xenbus? > > That''s basically what my original patch did.I''m not sure what "original patch" you mean. Is it one that hasn''t been applied yet, or has been applied very recently? _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
* Magenheimer, Dan (HP Labs Fort Collins) (dan.magenheimer@hp.com) wrote:> > From: Chris Wright [mailto:chrisw@osdl.org] > > (dan.magenheimer@hp.com) wrote: > > > Now that xenstore is in the mainline and xenstored.h is > > > part of the API to xenlinux, should xenstored.h be > > > moved into xen/include/public instead of being > > > mkbuildtree''d from tools/xenstore to drivers/xen/xenbus? > > > > That''s basically what my original patch did. > > I''m not sure what "original patch" you mean. Is it > one that hasn''t been applied yet, or has been applied very > recently?One that got applied about a month ago, just edited from the original to make it mkbuildtree''d to drivers/xen/xenbus rather than put in public dir (I chose linux-public rather than xen-public as this is a userspace interface not a hypervisor interface). _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Chris Wright
2005-Sep-13 01:31 UTC
[Xen-devel] [PATCH] Put xenstored.h in linux-public include dir
Dan, how does this one work for you? Put xenstored.h in linux-public include dir. Signed-off-by: Chris Wright <chrisw@osdl.org> --- diff -r d8637529daff linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c Mon Sep 12 21:42:26 2005 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c Mon Sep 12 18:28:07 2005 @@ -37,12 +37,12 @@ #include <linux/wait.h> #include <linux/fs.h> -#include "xenstored.h" #include "xenbus_comms.h" #include <asm/uaccess.h> #include <asm-xen/xenbus.h> #include <asm-xen/xen_proc.h> +#include <asm-xen/linux-public/xenstored.h> struct xenbus_dev_data { /* Are there bytes left to be read in this message? */ diff -r d8637529daff linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c Mon Sep 12 21:42:26 2005 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c Mon Sep 12 18:28:07 2005 @@ -38,7 +38,7 @@ #include <linux/fcntl.h> #include <linux/kthread.h> #include <asm-xen/xenbus.h> -#include "xenstored.h" +#include <asm-xen/linux-public/xenstored.h> #include "xenbus_comms.h" #define streq(a, b) (strcmp((a), (b)) == 0) diff -r d8637529daff linux-2.6-xen-sparse/mkbuildtree --- a/linux-2.6-xen-sparse/mkbuildtree Mon Sep 12 21:42:26 2005 +++ b/linux-2.6-xen-sparse/mkbuildtree Mon Sep 12 18:28:07 2005 @@ -108,5 +108,5 @@ cd ${AD}/include/asm-xen/xen-public relative_lndir ../../../${RS}/../xen/include/public -cd ${AD}/drivers/xen/xenbus +cd ${AD}/include/asm-xen/linux-public ln -sf ../../../${RS}/../tools/xenstore/xenstored.h _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Christian Limpach
2005-Sep-13 08:36 UTC
Re: [Xen-devel] [PATCH] Put xenstored.h in linux-public include dir
Thanks! On 9/13/05, Chris Wright <chrisw@osdl.org> wrote:> Dan, how does this one work for you? > > Put xenstored.h in linux-public include dir. > > Signed-off-by: Chris Wright <chrisw@osdl.org> > --- > > diff -r d8637529daff linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c > --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c Mon Sep 12 21:42:26 2005 > +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c Mon Sep 12 18:28:07 2005 > @@ -37,12 +37,12 @@ > #include <linux/wait.h> > #include <linux/fs.h> > > -#include "xenstored.h" > #include "xenbus_comms.h" > > #include <asm/uaccess.h> > #include <asm-xen/xenbus.h> > #include <asm-xen/xen_proc.h> > +#include <asm-xen/linux-public/xenstored.h> > > struct xenbus_dev_data { > /* Are there bytes left to be read in this message? */ > diff -r d8637529daff linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c > --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c Mon Sep 12 21:42:26 2005 > +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c Mon Sep 12 18:28:07 2005 > @@ -38,7 +38,7 @@ > #include <linux/fcntl.h> > #include <linux/kthread.h> > #include <asm-xen/xenbus.h> > -#include "xenstored.h" > +#include <asm-xen/linux-public/xenstored.h> > #include "xenbus_comms.h" > > #define streq(a, b) (strcmp((a), (b)) == 0) > diff -r d8637529daff linux-2.6-xen-sparse/mkbuildtree > --- a/linux-2.6-xen-sparse/mkbuildtree Mon Sep 12 21:42:26 2005 > +++ b/linux-2.6-xen-sparse/mkbuildtree Mon Sep 12 18:28:07 2005 > @@ -108,5 +108,5 @@ > cd ${AD}/include/asm-xen/xen-public > relative_lndir ../../../${RS}/../xen/include/public > > -cd ${AD}/drivers/xen/xenbus > +cd ${AD}/include/asm-xen/linux-public > ln -sf ../../../${RS}/../tools/xenstore/xenstored.h > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel >_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel