ia64/xen-unstable

changeset 14897:800aa9f5cec9

[TAPDISK] Move tapdisk control files from /dev/xen to /var/run/tap
Signed-off-by: Jake Wires <jwires@xensource.com>
author Jake Wires <jwires@xensource.com>
date Mon Apr 23 17:15:38 2007 -0700 (2007-04-23)
parents f033cc5cc0d5
children 5607a3afedb0
files tools/blktap/drivers/blktapctrl.c tools/blktap/lib/blktaplib.h
line diff
     1.1 --- a/tools/blktap/drivers/blktapctrl.c	Mon Apr 23 15:37:53 2007 -0700
     1.2 +++ b/tools/blktap/drivers/blktapctrl.c	Mon Apr 23 17:15:38 2007 -0700
     1.3 @@ -495,11 +495,13 @@ int blktapctrl_new_blkif(blkif_t *blkif)
     1.4  
     1.5  		if (!exist) {
     1.6  			DPRINTF("Process does not exist:\n");
     1.7 -			asprintf(&rdctldev, "/dev/xen/tapctrlread%d", minor);
     1.8 +			asprintf(&rdctldev, 
     1.9 +				 "%s/tapctrlread%d", BLKTAP_DEV_DIR, minor);
    1.10  			blkif->fds[READ] = open_ctrl_socket(rdctldev);
    1.11  
    1.12  
    1.13 -			asprintf(&wrctldev, "/dev/xen/tapctrlwrite%d", minor);
    1.14 +			asprintf(&wrctldev, 
    1.15 +				 "%s/tapctrlwrite%d", BLKTAP_DEV_DIR, minor);
    1.16  			blkif->fds[WRITE] = open_ctrl_socket(wrctldev);
    1.17  			
    1.18  			if (blkif->fds[READ] == -1 || blkif->fds[WRITE] == -1) 
     2.1 --- a/tools/blktap/lib/blktaplib.h	Mon Apr 23 15:37:53 2007 -0700
     2.2 +++ b/tools/blktap/lib/blktaplib.h	Mon Apr 23 17:15:38 2007 -0700
     2.3 @@ -78,7 +78,7 @@ static inline int BLKTAP_MODE_VALID(unsi
     2.4  
     2.5  #define BLKTAP_IOCTL_KICK 1
     2.6  #define MAX_PENDING_REQS	BLK_RING_SIZE
     2.7 -#define BLKTAP_DEV_DIR   "/dev/xen"
     2.8 +#define BLKTAP_DEV_DIR   "/var/run/tap"
     2.9  #define BLKTAP_DEV_NAME  "blktap"
    2.10  #define BLKTAP_DEV_MINOR 0
    2.11