# HG changeset patch
# User Brendan Cully <brendan@xxxxxxxxx>
# Date 1178124163 25200
# Node ID f8d58ba6ba169a958539b85c771d47a2a2b1a322
# Parent  c1fafdcdb19a781a603988346e49deae07054a54
Put blktap character device back into /dev/xen.
Changeset 14895:800aa9f5cec9 accidentally moved it into /var/run/tap
along with the control FIFOs.
Signed-off-by: Brendan Cully <brendan@xxxxxxxxx>

diff -r c1fafdcdb19a -r f8d58ba6ba16 tools/blktap/drivers/blktapctrl.c
--- a/tools/blktap/drivers/blktapctrl.c	Tue May 01 22:24:01 2007 +0100
+++ b/tools/blktap/drivers/blktapctrl.c	Wed May 02 09:42:43 2007 -0700
@@ -496,12 +496,12 @@ int blktapctrl_new_blkif(blkif_t *blkif)
 		if (!exist) {
 			DPRINTF("Process does not exist:\n");
 			asprintf(&rdctldev, 
-				 "%s/tapctrlread%d", BLKTAP_DEV_DIR, minor);
+				 "%s/tapctrlread%d", BLKTAP_CTRL_DIR, minor);
 			blkif->fds[READ] = open_ctrl_socket(rdctldev);
 
 
 			asprintf(&wrctldev, 
-				 "%s/tapctrlwrite%d", BLKTAP_DEV_DIR, minor);
+				 "%s/tapctrlwrite%d", BLKTAP_CTRL_DIR, minor);
 			blkif->fds[WRITE] = open_ctrl_socket(wrctldev);
 			
 			if (blkif->fds[READ] == -1 || blkif->fds[WRITE] == -1) 
@@ -601,6 +601,8 @@ int open_ctrl_socket(char *devname)
 	fd_set socks;
 	struct timeval timeout;
 
+	if (mkdir(BLKTAP_CTRL_DIR, 0755) == 0)
+		DPRINTF("Created %s directory\n", BLKTAP_CTRL_DIR);
 	ret = mkfifo(devname,S_IRWXU|S_IRWXG|S_IRWXO);
 	if ( (ret != 0) && (errno != EEXIST) ) {
 		DPRINTF("ERROR: pipe failed (%d)\n", errno);
diff -r c1fafdcdb19a -r f8d58ba6ba16 tools/blktap/lib/blktaplib.h
--- a/tools/blktap/lib/blktaplib.h	Tue May 01 22:24:01 2007 +0100
+++ b/tools/blktap/lib/blktaplib.h	Wed May 02 09:42:43 2007 -0700
@@ -78,9 +78,10 @@ static inline int BLKTAP_MODE_VALID(unsi
 
 #define BLKTAP_IOCTL_KICK 1
 #define MAX_PENDING_REQS	BLK_RING_SIZE
-#define BLKTAP_DEV_DIR   "/var/run/tap"
+#define BLKTAP_DEV_DIR   "/dev/xen"
 #define BLKTAP_DEV_NAME  "blktap"
 #define BLKTAP_DEV_MINOR 0
+#define BLKTAP_CTRL_DIR   "/var/run/tap"
 
 extern int blktap_major;