diff options
| author | Brendan Cully <brendan@cs.ubc.ca> | 2007-05-02 09:42:43 -0700 |
|---|---|---|
| committer | Brendan Cully <brendan@cs.ubc.ca> | 2007-05-02 09:42:43 -0700 |
| commit | 5d93b6f1837d91fdd282cd34f81e4bcba2421955 (patch) | |
| tree | 09662b34a38bbc558361b37857d9ee0698dcb711 /tools/blktap | |
| parent | ffed4cf8e83d7baedcac0bcbb3ae25acbe3da503 (diff) | |
| download | xen-5d93b6f1837d91fdd282cd34f81e4bcba2421955.tar.gz xen-5d93b6f1837d91fdd282cd34f81e4bcba2421955.tar.bz2 xen-5d93b6f1837d91fdd282cd34f81e4bcba2421955.zip | |
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@cs.ubc.ca>
Diffstat (limited to 'tools/blktap')
| -rw-r--r-- | tools/blktap/drivers/blktapctrl.c | 6 | ||||
| -rw-r--r-- | tools/blktap/lib/blktaplib.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tools/blktap/drivers/blktapctrl.c b/tools/blktap/drivers/blktapctrl.c index 938c53d273..42b74b3c7a 100644 --- a/tools/blktap/drivers/blktapctrl.c +++ b/tools/blktap/drivers/blktapctrl.c @@ -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 --git a/tools/blktap/lib/blktaplib.h b/tools/blktap/lib/blktaplib.h index 996ed60aa9..0e2a9109b1 100644 --- a/tools/blktap/lib/blktaplib.h +++ b/tools/blktap/lib/blktaplib.h @@ -78,9 +78,10 @@ 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 "/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; |