Permalink
Browse files

librumpxen_xendev: Re-enable build for xenbus, and add it to the defa…

…ult bake

Fixes issue #73 for the xenbus driver.

privcmd and evtchn are not fixed yet - they are still disabled.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
  • Loading branch information...
1 parent 92dd08b commit 0c83c344c98fe36595d5ba310a2bea43f02216df @ijackson-citrix ijackson-citrix committed with ijackson-citrix Sep 5, 2016
Showing with 5 additions and 9 deletions.
  1. +1 −1 app-tools/rumprun-bake.conf
  2. +2 −6 platform/xen/Makefile
  3. +2 −2 platform/xen/librumpxen_xendev/xendev_component.c
@@ -118,7 +118,7 @@ conf xen_pv
assimilate _miconf
add -lrumpfs_kernfs \
-lrumpnet_xenif \
- # -lrumpxen_xendev issue 73
+ -lrumpxen_xendev
fnoc
conf xen_pci
@@ -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 $@ \
@@ -59,7 +59,7 @@ static const struct xen_dev_info {
[cmin] = { path, init_fn, component##_dev_open, \
&component##_dev_fileops }
XDEV(0, DEV_XEN "/xenbus", NULL, xenbus),
-// XDEV(1, "/dev/xenevt", xenevt_dev_init, xenevt),
+// XDEV(1, "/dev/xenevt", xenevt_dev_init, xenevt), XXX issue #73
#undef XDEV
};
@@ -156,7 +156,7 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV)
}
xenkernfs_init();
-// xenprivcmd_init();
+// xenprivcmd_init(); XXX issue #73
}
/*

0 comments on commit 0c83c34

Please sign in to comment.