aboutsummaryrefslogtreecommitdiffstats
path: root/tools/blktap
diff options
context:
space:
mode:
authorJake Wires <jwires@xensource.com>2007-04-23 17:15:38 -0700
committerJake Wires <jwires@xensource.com>2007-04-23 17:15:38 -0700
commit34cb79470115e55356332aab92a405f41b565614 (patch)
tree6d15f303e8f3c5873dd9643d831a95a90ed3f77c /tools/blktap
parentc4f51da19fac025539ac3264b0c6e3f9e0f533b6 (diff)
downloadxen-34cb79470115e55356332aab92a405f41b565614.tar.gz
xen-34cb79470115e55356332aab92a405f41b565614.tar.bz2
xen-34cb79470115e55356332aab92a405f41b565614.zip
[TAPDISK] Move tapdisk control files from /dev/xen to /var/run/tap
Signed-off-by: Jake Wires <jwires@xensource.com>
Diffstat (limited to 'tools/blktap')
-rw-r--r--tools/blktap/drivers/blktapctrl.c6
-rw-r--r--tools/blktap/lib/blktaplib.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/blktap/drivers/blktapctrl.c b/tools/blktap/drivers/blktapctrl.c
index 499da6add9..938c53d273 100644
--- a/tools/blktap/drivers/blktapctrl.c
+++ b/tools/blktap/drivers/blktapctrl.c
@@ -495,11 +495,13 @@ int blktapctrl_new_blkif(blkif_t *blkif)
if (!exist) {
DPRINTF("Process does not exist:\n");
- asprintf(&rdctldev, "/dev/xen/tapctrlread%d", minor);
+ asprintf(&rdctldev,
+ "%s/tapctrlread%d", BLKTAP_DEV_DIR, minor);
blkif->fds[READ] = open_ctrl_socket(rdctldev);
- asprintf(&wrctldev, "/dev/xen/tapctrlwrite%d", minor);
+ asprintf(&wrctldev,
+ "%s/tapctrlwrite%d", BLKTAP_DEV_DIR, minor);
blkif->fds[WRITE] = open_ctrl_socket(wrctldev);
if (blkif->fds[READ] == -1 || blkif->fds[WRITE] == -1)
diff --git a/tools/blktap/lib/blktaplib.h b/tools/blktap/lib/blktaplib.h
index 078a293185..996ed60aa9 100644
--- a/tools/blktap/lib/blktaplib.h
+++ b/tools/blktap/lib/blktaplib.h
@@ -78,7 +78,7 @@ static inline int BLKTAP_MODE_VALID(unsigned long arg)
#define BLKTAP_IOCTL_KICK 1
#define MAX_PENDING_REQS BLK_RING_SIZE
-#define BLKTAP_DEV_DIR "/dev/xen"
+#define BLKTAP_DEV_DIR "/var/run/tap"
#define BLKTAP_DEV_NAME "blktap"
#define BLKTAP_DEV_MINOR 0