diff options
| -rw-r--r-- | tools/blktap2/drivers/Makefile | 2 | ||||
| -rw-r--r-- | tools/blktap2/drivers/tapdisk.h | 4 | ||||
| -rw-r--r-- | tools/memshr/interface.c | 2 | ||||
| -rw-r--r-- | tools/memshr/memshr.h | 2 | ||||
| -rw-r--r-- | tools/memshr/shm.c | 2 | ||||
| -rw-r--r-- | tools/memshr/shm.h | 2 |
6 files changed, 9 insertions, 5 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)) diff --git a/tools/memshr/interface.c b/tools/memshr/interface.c index a61715ad7c..91cf7c6c1a 100644 --- a/tools/memshr/interface.c +++ b/tools/memshr/interface.c @@ -123,7 +123,7 @@ void memshr_vbd_initialize(void) vbd_info.enabled = 1; } -uint16_t memshr_vbd_image_get(char* file) +uint16_t memshr_vbd_image_get(const char* file) { uint16_t id; diff --git a/tools/memshr/memshr.h b/tools/memshr/memshr.h index 619174adaf..24dd04c4f3 100644 --- a/tools/memshr/memshr.h +++ b/tools/memshr/memshr.h @@ -28,7 +28,7 @@ typedef uint64_t xen_mfn_t; extern void memshr_set_domid(int domid); extern void memshr_daemon_initialize(void); extern void memshr_vbd_initialize(void); -extern uint16_t memshr_vbd_image_get(char* file); +extern uint16_t memshr_vbd_image_get(const char* file); extern void memshr_vbd_image_put(uint16_t memshr_id); extern int memshr_vbd_issue_ro_request(char *buf, grant_ref_t gref, diff --git a/tools/memshr/shm.c b/tools/memshr/shm.c index 34a6a1aa95..c925cf26ac 100644 --- a/tools/memshr/shm.c +++ b/tools/memshr/shm.c @@ -187,7 +187,7 @@ struct blockshr_hash * shm_blockshr_hash_open(int unlink) return h; } -uint16_t shm_vbd_image_get(char* file, vbd_image_info_t *vbd_imgs) +uint16_t shm_vbd_image_get(const char* file, vbd_image_info_t *vbd_imgs) { vbd_image_info_t *img, *next_img; int i, img_id; diff --git a/tools/memshr/shm.h b/tools/memshr/shm.h index 0acff14aaf..3ce675858e 100644 --- a/tools/memshr/shm.h +++ b/tools/memshr/shm.h @@ -44,7 +44,7 @@ typedef struct shared_memshr_info { shared_memshr_info_t * shm_shared_info_open(int unlink); struct fgprtshr_hash * shm_fgprtshr_hash_open(int unlink); struct blockshr_hash * shm_blockshr_hash_open(int unlink); -uint16_t shm_vbd_image_get(char* file, vbd_image_info_t *vbd_imgs); +uint16_t shm_vbd_image_get(const char* file, vbd_image_info_t *vbd_imgs); void shm_vbd_image_put(uint16_t memshr_id, vbd_image_info_t *vbd_imgs); #endif /* __SHM_H__ */ |