diff options
Diffstat (limited to 'tools/blktap')
| -rw-r--r-- | tools/blktap/drivers/Makefile | 4 | ||||
| -rw-r--r-- | tools/blktap/drivers/blktapctrl.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile index 469c3147e6..b7e392b3d8 100644 --- a/tools/blktap/drivers/Makefile +++ b/tools/blktap/drivers/Makefile @@ -4,6 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk IBIN = blktapctrl tapdisk QCOW_UTIL = img2qcow qcow2raw qcow-create LIBAIO_DIR = ../../libaio/src +MEMSHR_DIR = ../../memshr CFLAGS += -Werror CFLAGS += -Wno-unused @@ -11,6 +12,7 @@ CFLAGS += -I../lib CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(CFLAGS_libxenstore) CFLAGS += -I $(LIBAIO_DIR) +CFLAGS += -I $(MEMSHR_DIR) CFLAGS += -D_GNU_SOURCE ifeq ($(shell . ./check_gcrypt $(CC)),yes) @@ -21,7 +23,7 @@ CRYPT_LIB := -lcrypto $(warning === libgcrypt not installed: falling back to libcrypto ===) endif -LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) -L../lib -lblktap +LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) $(MEMSHR_DIR)/libmemshr.a -L../lib -lblktap -lrt -lm LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz BLK-OBJS-y := block-aio.o diff --git a/tools/blktap/drivers/blktapctrl.c b/tools/blktap/drivers/blktapctrl.c index 21cdfe5239..b5ebfee62e 100644 --- a/tools/blktap/drivers/blktapctrl.c +++ b/tools/blktap/drivers/blktapctrl.c @@ -50,6 +50,7 @@ #include <xs.h> #include <sys/time.h> #include <syslog.h> +#include <memshr.h> #include "blktaplib.h" #include "blktapctrl.h" @@ -858,6 +859,8 @@ int main(int argc, char *argv[]) goto open_failed; } + memshr_daemon_initialize(); + retry: /* Set up store connection and watch. */ h = xs_daemon_open(); |