[Xen-changelog] [xen-unstable] [TAPDISK] Move tapdisk control files from /dev/xen to /var/run/tap

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Jake Wires <jwires@xxxxxxxxxxxxx>
# Date 1177373738 25200
# Node ID 800aa9f5cec93681d291bf5660d61384627a0f09
# Parent  f033cc5cc0d5f14ee59a5309224aea7565fa8e87
[TAPDISK] Move tapdisk control files from /dev/xen to /var/run/tap
Signed-off-by: Jake Wires <jwires@xxxxxxxxxxxxx>
---
 tools/blktap/drivers/blktapctrl.c |    6 ++++--
 tools/blktap/lib/blktaplib.h      |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff -r f033cc5cc0d5 -r 800aa9f5cec9 tools/blktap/drivers/blktapctrl.c
--- a/tools/blktap/drivers/blktapctrl.c Mon Apr 23 15:37:53 2007 -0700
+++ b/tools/blktap/drivers/blktapctrl.c Mon Apr 23 17:15:38 2007 -0700
@@ -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 -r f033cc5cc0d5 -r 800aa9f5cec9 tools/blktap/lib/blktaplib.h
--- a/tools/blktap/lib/blktaplib.h      Mon Apr 23 15:37:53 2007 -0700
+++ b/tools/blktap/lib/blktaplib.h      Mon Apr 23 17:15:38 2007 -0700
@@ -78,7 +78,7 @@ static inline int BLKTAP_MODE_VALID(unsi
 
 #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
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog