diff options
| author | Andres Lagar-Cavilla <andres@lagarcavilla.org> | 2012-01-10 15:38:08 +0000 |
|---|---|---|
| committer | Andres Lagar-Cavilla <andres@lagarcavilla.org> | 2012-01-10 15:38:08 +0000 |
| commit | 2b82a7ad971a4293eea97d74d09bbc86ae4ec534 (patch) | |
| tree | d21c75593a066820d9e938e2b3388493560ed9fb /tools/blktap2 | |
| parent | b4ec697c64c6f29e9593ae22c66dd8d47dc35a39 (diff) | |
| download | xen-2b82a7ad971a4293eea97d74d09bbc86ae4ec534.tar.gz xen-2b82a7ad971a4293eea97d74d09bbc86ae4ec534.tar.bz2 xen-2b82a7ad971a4293eea97d74d09bbc86ae4ec534.zip | |
Add correct const-ness to memshr tool functions
This patch addresses some of the compile and link issues with the memshr
module.
Signed-off-by: Adin Scannell <adin@scannell.ca>
Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
Acked-by: Ian Jackson <ian.jackson.citrix.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
Diffstat (limited to 'tools/blktap2')
| -rw-r--r-- | tools/blktap2/drivers/Makefile | 2 | ||||
| -rw-r--r-- | tools/blktap2/drivers/tapdisk.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile index 405d2d3e94..15e1bc0df8 100644 --- a/tools/blktap2/drivers/Makefile +++ b/tools/blktap2/drivers/Makefile @@ -43,7 +43,7 @@ MEMSHR_DIR = $(XEN_ROOT)/tools/memshr MEMSHRLIBS := ifeq ($(CONFIG_Linux), __fixme__) CFLAGS += -DMEMSHR -MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a +MEMSHRLIBS += -L$(XEN_ROOT)/tools/libxc -lxenctrl $(MEMSHR_DIR)/libmemshr.a endif ifeq ($(VHD_STATIC),y) diff --git a/tools/blktap2/drivers/tapdisk.h b/tools/blktap2/drivers/tapdisk.h index f945fbfe64..c7013d7ccd 100644 --- a/tools/blktap2/drivers/tapdisk.h +++ b/tools/blktap2/drivers/tapdisk.h @@ -64,6 +64,10 @@ #include "tapdisk-log.h" #include "tapdisk-utils.h" +#ifdef MEMSHR +#include "memshr.h" +#endif + #define DPRINTF(_f, _a...) syslog(LOG_INFO, _f, ##_a) #define EPRINTF(_f, _a...) syslog(LOG_ERR, "tap-err:%s: " _f, __func__, ##_a) #define PERROR(_f, _a...) EPRINTF(_f ": %s", ##_a, strerror(errno)) |