@@ -119,7 +119,7 @@ LDLIBS_libxengnttab = $(SHDEPS_libxengnttab) $(XEN_LIBXENGNTTAB)/libxengnttab$(l
SHLIB_libxengnttab = $(SHDEPS_libxengnttab) -Wl,-rpath-link=$(XEN_LIBXENGNTTAB)
CFLAGS_libxencall = -I$(XEN_LIBXENCALL)/include $(CFLAGS_xeninclude)
-SHDEPS_libxencall =
+SHDEPS_libxencall = $(SHLIB_libxentoolcore)
LDLIBS_libxencall = $(SHDEPS_libxencall) $(XEN_LIBXENCALL)/libxencall$(libextension)
SHLIB_libxencall = $(SHDEPS_libxencall) -Wl,-rpath-link=$(XEN_LIBXENCALL)
@@ -7,7 +7,7 @@ SHLIB_LDFLAGS += -Wl,--version-script=libxencall.map
CFLAGS += -Werror -Wmissing-prototypes
CFLAGS += -I./include $(CFLAGS_xeninclude)
-CFLAGS += $(CFLAGS_libxentoollog)
+CFLAGS += $(CFLAGS_libxentoollog) $(CFLAGS_libxentoolcore)
SRCS-y += core.c buffer.c
SRCS-$(CONFIG_Linux) += linux.c
@@ -62,7 +62,7 @@ libxencall.so.$(MAJOR): libxencall.so.$(MAJOR).$(MINOR)
$(SYMLINK_SHLIB) $< $@
libxencall.so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxencall.map
- $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxencall.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS)
+ $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxencall.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxentoolcore) $(APPEND_LDFLAGS)
.PHONY: install
install: build
@@ -15,8 +15,41 @@
#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
#include "private.h"
+static int all_restrict_cb(Xentoolcore__Active_Handle *ah, uint32_t domid) {
+ xencall_handle *xcall = CONTAINER_OF(ah, *xcall, tc_ah);
+ int nullfd = -1, r;
+
+ if (xcall->fd < 0)
+ /* just in case */
+ return 0;
+
+ /*
+ * We don't implement a restrict function. We neuter the fd by
+ * dup'ing /dev/null onto it. This is better than closing it,
+ * because it does not involve locking against concurrent uses
+ * of xencall in other threads.
+ */
+ nullfd = open("/dev/null", O_RDONLY);
+ if (nullfd < 0) goto err;
+
+ r = dup2(nullfd, xcall->fd);
+ if (r < 0) goto err;
+
+ close(nullfd);
+ return 0;
+
+err:
+ if (nullfd >= 0) close(nullfd);
+ return -1;
+}
+
xencall_handle *xencall_open(xentoollog_logger *logger, unsigned open_flags)
{
xencall_handle *xcall = malloc(sizeof(*xcall));
@@ -25,6 +58,8 @@ xencall_handle *xencall_open(xentoollog_logger *logger, unsigned open_flags)
if (!xcall) return NULL;
xcall->fd = -1;
+ xcall->tc_ah.restrict_callback = all_restrict_cb;
+ xentoolcore__register_active_handle(&xcall->tc_ah);
xcall->flags = open_flags;
xcall->buffer_cache_nr = 0;
@@ -53,6 +88,7 @@ xencall_handle *xencall_open(xentoollog_logger *logger, unsigned open_flags)
err:
osdep_xencall_close(xcall);
+ xentoolcore__deregister_active_handle(&xcall->tc_ah);
xtl_logger_destroy(xcall->logger_tofree);
free(xcall);
return NULL;
@@ -66,6 +102,7 @@ int xencall_close(xencall_handle *xcall)
return 0;
rc = osdep_xencall_close(xcall);
+ xentoolcore__deregister_active_handle(&xcall->tc_ah);
buffer_release_cache(xcall);
xtl_logger_destroy(xcall->logger_tofree);
free(xcall);
@@ -21,6 +21,10 @@
#include <fcntl.h>
#include <unistd.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <stdio.h>
+
#include <sys/mman.h>
#include <sys/ioctl.h>
@@ -2,6 +2,7 @@
#define XENCALL_PRIVATE_H
#include <xentoollog.h>
+#include <xentoolcore_internal.h>
#include <xencall.h>
@@ -20,6 +21,7 @@ struct xencall_handle {
xentoollog_logger *logger, *logger_tofree;
unsigned flags;
int fd;
+ Xentoolcore__Active_Handle tc_ah;
/*
* A simple cache of unused, single page, hypercall buffers
@@ -7,4 +7,4 @@ Description: The Xencall library for Xen hypervisor
Version: @@version@@
Cflags: -I${includedir} @@cflagslocal@@
Libs: @@libsflag@@${libdir} -lxencall
-Requires.private: xentoollog
+Requires.private: xentoollog,xentoolcore