bitkeeper revision 1.1159.142.4 (4184b6d4rc3Jd2irJimPyupm4TO06A)

Rename Xen public interfaces.
 1. hypervisor-if.h is now xen.h
 2. hypervisor-ifs/ directory is now:
     <include/public/...> in Xen
     <asm/xen-public/...> in Linux
     <xen/...> in user space     

4 files changed, 13 insertions, 13 deletions

diff --git a/netbsd-2.0-xen-sparse/mkbuildtree b/netbsd-2.0-xen-sparse/mkbuildtree
index 2db906080a..1877db8a5e 100755
--- a/netbsd-2.0-xen-sparse/mkbuildtree
+++ b/netbsd-2.0-xen-sparse/mkbuildtree
@@ -103,11 +103,11 @@ relative_lndir ${RS}
 rm -f mkbuildtree
 
 
-# Create links to the shared definitions of the hypervisor interface
-rm -rf ${AD}/sys/arch/xen/include/hypervisor-ifs
-mkdir  ${AD}/sys/arch/xen/include/hypervisor-ifs
-cd     ${AD}/sys/arch/xen/include/hypervisor-ifs
-relative_lndir ../../../../../${RS}/../xen/include/hypervisor-ifs
+# Create links to the shared definitions of the Xen interface
+rm -rf ${AD}/sys/arch/xen/include/xen-public
+mkdir  ${AD}/sys/arch/xen/include/xen-public
+cd     ${AD}/sys/arch/xen/include/xen-public
+relative_lndir ../../../../../${RS}/../xen/include/public
 
 # Remove files which don't exist anymore
 rm -rf ${AD}/sys/arch/xen/xen/events.c
diff --git a/netbsd-2.0-xen-sparse/sys/arch/xen/include/hypervisor.h b/netbsd-2.0-xen-sparse/sys/arch/xen/include/hypervisor.h
index 3d3f1d38c7..035495d4be 100644
--- a/netbsd-2.0-xen-sparse/sys/arch/xen/include/hypervisor.h
+++ b/netbsd-2.0-xen-sparse/sys/arch/xen/include/hypervisor.h
@@ -54,12 +54,12 @@ struct xen_npx_attach_args {
 
 /* include the hypervisor interface */
 #include <sys/systm.h>
-#include <machine/hypervisor-ifs/hypervisor-if.h>
-#include <machine/hypervisor-ifs/dom0_ops.h>
-#include <machine/hypervisor-ifs/event_channel.h>
-#include <machine/hypervisor-ifs/io/domain_controller.h>
-#include <machine/hypervisor-ifs/io/netif.h>
-#include <machine/hypervisor-ifs/io/blkif.h>
+#include <machine/xen-public/xen.h>
+#include <machine/xen-public/dom0_ops.h>
+#include <machine/xen-public/event_channel.h>
+#include <machine/xen-public/io/domain_controller.h>
+#include <machine/xen-public/io/netif.h>
+#include <machine/xen-public/io/blkif.h>
 
 #undef u8
 #undef u16
diff --git a/netbsd-2.0-xen-sparse/sys/arch/xen/include/xen.h b/netbsd-2.0-xen-sparse/sys/arch/xen/include/xen.h
index 274dad8410..e590db5ae6 100644
--- a/netbsd-2.0-xen-sparse/sys/arch/xen/include/xen.h
+++ b/netbsd-2.0-xen-sparse/sys/arch/xen/include/xen.h
@@ -85,7 +85,7 @@ void vprintk(const char *, va_list);
 
 
 /*
- * these are also defined in hypervisor-if.h but can't be pulled in as
+ * these are also defined in xen-public/xen.h but can't be pulled in as
  * they are used in start of day assembly. Need to clean up the .h files
  * a bit more...
  */
diff --git a/netbsd-2.0-xen-sparse/sys/arch/xen/xen/xenkbc.c b/netbsd-2.0-xen-sparse/sys/arch/xen/xen/xenkbc.c
index e54615567b..ede2207965 100644
--- a/netbsd-2.0-xen-sparse/sys/arch/xen/xen/xenkbc.c
+++ b/netbsd-2.0-xen-sparse/sys/arch/xen/xen/xenkbc.c
@@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: xenkbc.c,v 1.3.2.1 2004/05/22 15:57:43 he Exp $");
 #include <machine/xenkbcvar.h>
 #include <machine/xen.h>
 #include <machine/hypervisor.h>
-#include <machine/hypervisor-ifs/kbd.h>
+#include <machine/xen-public/kbd.h>
 #include <machine/evtchn.h>
 
 #define	KBC_DELAY	DELAY(1000)