Small blktap cleanups.

Signed-off-by: Andrew Warfield <andy@xensource.com>

4 files changed, 16 insertions, 8 deletions

diff --git a/tools/blktap/drivers/block-aio.c b/tools/blktap/drivers/block-aio.c
index 48307faef5..ca086b7faa 100644
--- a/tools/blktap/drivers/block-aio.c
+++ b/tools/blktap/drivers/block-aio.c
@@ -161,7 +161,7 @@ int tdaio_open (struct td_state *s, const char *name)
                                 "trying to concurrently use a large number "
                                 "of blktap-based disks, you may need to "
                                 "increase the system-wide aio request limit. "
-                                "(e.g. 'echo echo 1048576 > /proc/sys/"
+                                "(e.g. 'echo echo 1048576 > /proc/sys/fs/"
                                 "aio-max-nr')\n");
                 } else {
                         DPRINTF("Couldn't get fd for AIO poll support.  This "
diff --git a/tools/blktap/drivers/block-qcow.c b/tools/blktap/drivers/block-qcow.c
index d586534161..d89cbcfc02 100644
--- a/tools/blktap/drivers/block-qcow.c
+++ b/tools/blktap/drivers/block-qcow.c
@@ -182,7 +182,7 @@ static int init_aio_state(struct td_state *bs)
                                 "trying to concurrently use a large number "
                                 "of blktap-based disks, you may need to "
                                 "increase the system-wide aio request limit. "
-                                "(e.g. 'echo echo 1048576 > /proc/sys/"
+                                "(e.g. 'echo echo 1048576 > /proc/sys/fs/"
                                 "aio-max-nr')\n");
                 } else {
                         DPRINTF("Couldn't get fd for AIO poll support.  This "
diff --git a/tools/blktap/drivers/tapdisk.c b/tools/blktap/drivers/tapdisk.c
index dfbbc97801..0b319ac0ec 100644
--- a/tools/blktap/drivers/tapdisk.c
+++ b/tools/blktap/drivers/tapdisk.c
@@ -110,6 +110,7 @@ static void unmap_disk(struct td_state *s)
 	free(s->fd_entry);
 	free(s->blkif);
 	free(s->ring_info);
+        free(s->private);
 	free(s);
 
 	return;
diff --git a/tools/blktap/lib/xs_api.c b/tools/blktap/lib/xs_api.c
index 8dd491a800..c6c22165c8 100644
--- a/tools/blktap/lib/xs_api.c
+++ b/tools/blktap/lib/xs_api.c
@@ -204,7 +204,7 @@ char *get_dom_domid(struct xs_handle *h, const char *name)
 int convert_dev_name_to_num(char *name) {
 	char *p_sd, *p_hd, *p_xvd, *p_plx, *p, *alpha,*ptr;
 	int majors[10] = {3,22,33,34,56,57,88,89,90,91};
-	int maj,i;
+	int maj,i,ret = 0;
 
 	asprintf(&p_sd,"/dev/sd");
 	asprintf(&p_hd,"/dev/hd");
@@ -221,7 +221,7 @@ int convert_dev_name_to_num(char *name) {
 			*ptr++;
 		}
 		*p++;
-		return BASE_DEV_VAL + (16*i) + atoi(p);
+		ret = BASE_DEV_VAL + (16*i) + atoi(p);
 	} else if (strstr(name, p_hd) != NULL) {
 		p = name + strlen(p_hd);
 		for (i = 0, ptr = alpha; i < strlen(alpha); i++) {
@@ -229,7 +229,7 @@ int convert_dev_name_to_num(char *name) {
 			*ptr++;
 		}
 		*p++;
-		return (majors[i/2]*256) + atoi(p);
+		ret = (majors[i/2]*256) + atoi(p);
 
 	} else if (strstr(name, p_xvd) != NULL) {
 		p = name + strlen(p_xvd);
@@ -238,16 +238,23 @@ int convert_dev_name_to_num(char *name) {
 			*ptr++;
 		}
 		*p++;
-		return (202*256) + (16*i) + atoi(p);
+		ret = (202*256) + (16*i) + atoi(p);
 
 	} else if (strstr(name, p_plx) != NULL) {
 		p = name + strlen(p_plx);
-		return atoi(p);
+		ret = atoi(p);
 
 	} else {
 		DPRINTF("Unknown device type, setting to default.\n");
-		return BASE_DEV_VAL;
+		ret = BASE_DEV_VAL;
 	}
+
+        free(p_sd);
+        free(p_hd);
+        free(p_xvd);
+        free(p_plx);
+        free(alpha);
+        
 	return 0;
 }