Attachment 312449 Details for Bug 456392 – Change blktapctrl to use the extended IOCTL for > 16 devices

[patch] Change blktapctrl to use the extended IOCTL for > 16 devices

expand-xvd-16-tools-blktapctrl.patch (text/plain), 2.45 KB, created by Chris Lalancette on 2008-07-23 10:04:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lalancette

Created: 2008-07-23 10:04:04 UTC

Size: 2.45 KB

patch

obsolete

>diff -urp xen-3.1.0-src/tools/blktap/drivers/blktapctrl.c xen-3.1.0-src.new/tools/blktap/drivers/blktapctrl.c
>--- xen-3.1.0-src/tools/blktap/drivers/blktapctrl.c	2007-05-18 16:45:21.000000000 +0200
>+++ xen-3.1.0-src.new/tools/blktap/drivers/blktapctrl.c	2008-07-14 20:59:58.000000000 +0200
>@@ -124,12 +124,25 @@ static void make_blktap_dev(char *devnam
> static int get_new_dev(int *major, int *minor, blkif_t *blkif)
> {
> 	domid_translate_t tr;
>+	domid_translate_ext_t tr_ext;
> 	int ret;
> 	char *devname;
>-	
>-	tr.domid = blkif->domid;
>-        tr.busid = (unsigned short)blkif->be_id;
>-	ret = ioctl(ctlfd, BLKTAP_IOCTL_NEWINTF, tr );
>+
>+	if (blkif->be_id >= (1<<28)) {
>+		/* new-style backend-id, so use the extended structure */
>+		tr_ext.domid = blkif->domid;
>+		tr_ext.busid = blkif->be_id;
>+		ret = ioctl(ctlfd, BLKTAP_IOCTL_NEWINTF_EXT, &tr_ext);
>+		DPRINTF("Sent domid %d and be_id %d\n", tr_ext.domid,
>+			tr_ext.busid);
>+	}
>+	else {
>+		/* old-style backend-id; use the old structure */
>+		tr.domid = blkif->domid;
>+		tr.busid = (unsigned short)blkif->be_id;
>+		ret = ioctl(ctlfd, BLKTAP_IOCTL_NEWINTF, tr);
>+		DPRINTF("Sent domid %d and be_id %d\n", tr.domid, tr.busid);
>+	}
> 	
> 	if ( (ret <= 0)||(ret > MAX_TAP_DEV) ) {
> 		DPRINTF("Incorrect Dev ID [%d]\n",ret);
>@@ -145,9 +158,8 @@ static int get_new_dev(int *major, int *
> 
> 	asprintf(&devname,"%s/%s%d",BLKTAP_DEV_DIR, BLKTAP_DEV_NAME, *minor);
> 	make_blktap_dev(devname,*major,*minor);	
>-	DPRINTF("Received device id %d and major %d, "
>-		"sent domid %d and be_id %d\n",
>-		*minor, *major, tr.domid, tr.busid);
>+	DPRINTF("Received device id %d and major %d\n",
>+		*minor, *major);
> 	return 0;
> }
> 
>diff -urp xen-3.1.0-src/tools/blktap/lib/blktaplib.h xen-3.1.0-src.new/tools/blktap/lib/blktaplib.h
>--- xen-3.1.0-src/tools/blktap/lib/blktaplib.h	2008-07-01 13:36:32.000000000 +0200
>+++ xen-3.1.0-src.new/tools/blktap/lib/blktaplib.h	2008-07-01 13:32:10.000000000 +0200
>@@ -56,6 +56,7 @@
> #define BLKTAP_IOCTL_MAJOR	     7
> #define BLKTAP_QUERY_ALLOC_REQS      8
> #define BLKTAP_IOCTL_FREEINTF	     9
>+#define BLKTAP_IOCTL_NEWINTF_EXT    50
> #define BLKTAP_IOCTL_PRINT_IDXS      100   
> 
> /* blktap switching modes: (Set with BLKTAP_IOCTL_SETMODE)             */
>@@ -163,6 +164,11 @@ typedef struct domid_translate {
> 	unsigned short busid;
> } domid_translate_t ;
> 
>+typedef struct domid_translate_ext {
>+	unsigned short domid;
>+	uint32_t busid;
>+} domid_translate_ext_t ;
>+
> typedef struct image {
> 	unsigned long long size;
> 	unsigned long secsize;

Actions: View | Diff

Attachments on bug 456392: 312449 | 312450