Merge pull request #83 from ijackson-citrix/xendev-xenbus-fix

Xendev xenbus fix
rumpkernel · Oct 18, 2016 · 39a97f3 · 39a97f3
2 parents ad23d14 + ef0bfb8
commit 39a97f3
Show file tree

Hide file tree

Showing 9 changed files with 844 additions and 654 deletions.
diff --git a/app-tools/rumprun-bake.conf b/app-tools/rumprun-bake.conf
@@ -118,7 +118,7 @@ conf xen_pv
 	assimilate	_miconf
 	add		-lrumpfs_kernfs		\
 			-lrumpnet_xenif		\
-			# -lrumpxen_xendev issue 73
+			-lrumpxen_xendev
 fnoc
 
 conf xen_pci

diff --git a/build-rr.sh b/build-rr.sh
@@ -229,7 +229,7 @@ probeprereqs ()
 		. "${RROBJ}/config.sh"
 		# probe location of Xen headers
 		found=false
-		for loc in /usr/pkg/include/xen /usr/include/xen; do
+		for loc in ${XEN_HEADERS:-} /usr/pkg/include/xen /usr/include/xen; do
 			if printf '#include <stdint.h>\n#include <xen.h>\n'\
 			    | ${CC} -I${loc} -x c - -c -o /dev/null \
 			    >/dev/null 2>&1 ; then

diff --git a/platform/xen/Makefile b/platform/xen/Makefile
@@ -14,9 +14,7 @@ OBJ_DIR ?= $(CURDIR)/obj
 
 LDSCRIPT:= $(abspath $(OBJ_DIR)/xen/minios.lds)
 
-# XXX: issue #73
-#INSTALLTGTS=	librumpxen_xendev_install librumpnet_xenif_install
-INSTALLTGTS=	librumpnet_xenif_install
+INSTALLTGTS=	librumpxen_xendev_install librumpnet_xenif_install
 
 include ../Makefile.inc
 
@@ -51,9 +49,7 @@ links:
 $(eval $(call BUILDLIB_target,librumpxen_xendev,.))
 $(eval $(call BUILDLIB_target,librumpnet_xenif,.))
 
-# XXX: issue #73
-#xenlibs: ${RROBJLIB}/librumpxen_xendev/librumpxen_xendev.a ${RROBJLIB}/librumpnet_xenif/librumpnet_xenif.a
-xenlibs: ${RROBJLIB}/librumpnet_xenif/librumpnet_xenif.a
+xenlibs: ${RROBJLIB}/librumpxen_xendev/librumpxen_xendev.a ${RROBJLIB}/librumpnet_xenif/librumpnet_xenif.a
 
 $(MAINOBJ): $(RUMP_OBJS) platformlibs xenlibs
 	$(CC) -Wl,-r $(CFLAGS) $(LDFLAGS) $(RUMP_OBJS) -nostdlib -o $@ \

diff --git a/platform/xen/librumpxen_xendev/Makefile b/platform/xen/librumpxen_xendev/Makefile
@@ -1,24 +1,32 @@
+.include <bsd.own.mk>
+
 LIB=	rumpxen_xendev
 
 SRCS=	xendev_component.c
 SRCS+=	busdev.c
-SRCS+=	evtdev.c
-SRCS+=	privcmd.c
+# XXX: issue #73
+#SRCS+=	evtdev.c
+#SRCS+=	privcmd.c
 
 RUMPTOP= ${TOPRUMP}
 
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpvfs
+CPPFLAGS+=	-I${.CURDIR}/../xen/include
 CPPFLAGS+=	-I${.CURDIR}
-CPPFLAGS+=	-I${.CURDIR}/../xen/include -D__RUMP_KERNEL__ -I${.CURDIR}/..
-CPPFLAGS+=	-I${.CURDIR}/../../../include
 
-.if ${BUILDRR:Uno} == "true"
-.include "${RUMPRUN_MKCONF}"
-CPPFLAGS+=	-I${OBJDIR}/dest.stage/include
+RUMPCOMP_USER_SRCS=	busdev_user.c
+RUMPCOMP_USER_CPPFLAGS+= -I${.CURDIR}/..
+RUMPCOMP_USER_CPPFLAGS+= -I${.CURDIR}/../xen/include
+RUMPCOMP_USER_CPPFLAGS+= -I${.CURDIR}/../../../include
+
+.ifdef RUMP_DEV_XEN_DEBUG
+CPPFLAGS+= -DRUMP_DEV_XEN_DEBUG=1
+RUMPCOMP_USER_CPPFLAGS+= -DRUMP_DEV_XEN_DEBUG=1
 .endif
 
-RUMP_SYM_NORENAME=xenbus_|HYPERVISOR_|minios_|bmk_
+# XXX
+.undef RUMPKERN_ONLY
 
 .include "${RUMPTOP}/Makefile.rump"
 .include <bsd.lib.mk>