From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wright <chrisw@osdl.org>
Subject: [PATCH] Put xenstored.h in linux-public include dir
Date: Mon, 12 Sep 2005 18:31:52 -0700
Message-ID: <20050913013152.GD7762@shell0.pdx.osdl.net>
References: <516F50407E01324991DD6D07B0531AD5695A24@cacexc12.americas.cpqcorp.net>
	<20050913000700.GC7762@shell0.pdx.osdl.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
In-Reply-To: <20050913000700.GC7762@shell0.pdx.osdl.net>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: "Magenheimer, Dan (HP Labs Fort Collins)" <dan.magenheimer@hp.com>
Cc: Chris Wright <chrisw@osdl.org>, xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

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