RE: xenstored.h

RE: xenstored.h

[Magenheimer, Dan (HP Labs Fort Collins)]

> 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? 

Re: xenstored.h

[Chris Wright]

* 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).

[PATCH] Put xenstored.h in linux-public include dir

[Chris Wright]

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

Re: [PATCH] Put xenstored.h in linux-public include dir

[Christian Limpach]

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
>