Skip to contentSkip to conversation

xenstored.h

PATCH In review Magenheimer, Dan (HP Labs Fort Collins) 3 participants 4 messages Sep 12, 2005 – Sep 13, 2005

lore
Share & tools
lore
#0 lore raw
Quoted 8 lines

From: Chris Wright [mailto:[email protected]]

Quoted 4 lines · ([email protected]) 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?

#1 lore raw
Quoted 7 lines · * Magenheimer, Dan (HP Labs Fort Collins) ([email protected]) wrote:
Quoted 7 lines

From: Chris Wright [mailto:[email protected]]

Quoted 4 lines · ([email protected]) 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?

Quoted 5 lines
Quoted 1 line

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

#2 lore raw

PATCH 1/1 Put xenstored.h in linux-public include dir

Dan, how does this one work for you?

Put xenstored.h in linux-public include dir.

---

linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c +1 -1
diff -r d8637529daff linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c
@@ -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? */
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c +1 -1
diff -r d8637529daff linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
@@ -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)
linux-2.6-xen-sparse/mkbuildtree +1 -1
diff -r d8637529daff linux-2.6-xen-sparse/mkbuildtree
@@ -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
#3 lore raw

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

Thanks!

Quoted 52 lines · Chris Wright

Dan, how does this one work for you?

Put xenstored.h in linux-public include dir.

---

diff -r d8637529daff linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c

linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c Mon Sep 12 18:28:07 2005 renamed from linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c Mon Sep 12 21:42:26 2005 +1 -1
@@ -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

linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c Mon Sep 12 18:28:07 2005 renamed from linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c Mon Sep 12 21:42:26 2005 +1 -1
@@ -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

linux-2.6-xen-sparse/mkbuildtree Mon Sep 12 18:28:07 2005 renamed from linux-2.6-xen-sparse/mkbuildtree Mon Sep 12 21:42:26 2005 +1 -1
@@ -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
[email protected]
http://lists.xensource.com/xen-devel