From 0c83c344c98fe36595d5ba310a2bea43f02216df Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 5 Sep 2016 15:47:39 +0100 Subject: [PATCH] librumpxen_xendev: Re-enable build for xenbus, and add it to the default bake Fixes issue #73 for the xenbus driver. privcmd and evtchn are not fixed yet - they are still disabled. Signed-off-by: Ian Jackson --- app-tools/rumprun-bake.conf | 2 +- platform/xen/Makefile | 8 ++------ platform/xen/librumpxen_xendev/xendev_component.c | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app-tools/rumprun-bake.conf b/app-tools/rumprun-bake.conf index 66262e9..b54e16e 100644 --- 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/platform/xen/Makefile b/platform/xen/Makefile index 5c6c5d0..4f074f7 100644 --- 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/xendev_component.c b/platform/xen/librumpxen_xendev/xendev_component.c index 92471e8..4195195 100644 --- a/platform/xen/librumpxen_xendev/xendev_component.c +++ b/platform/xen/librumpxen_xendev/xendev_component.c @@ -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 } /* -- 2.39.5