Blktapctrl compatibility layer

I originally had just changed the NEWINTF ioctl to send over 48-bits
of information, which works on 64-bit but not on 32-bit (since the arg
is an unsigned long).  Additionally, the previous changes would break
an older userland against a new kernel.  For that reason, introduce a
new ioctl (NEWINTF_EXT) that fixes both of these problems.  This is
the dom0 userland side.

Signed-off-by: Chris Lalancette <clalance@redhat.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/tools/blktap/lib/blktaplib.h b/tools/blktap/lib/blktaplib.h
index 1bba363933..58a6fd897a 100644
--- a/tools/blktap/lib/blktaplib.h
+++ b/tools/blktap/lib/blktaplib.h
@@ -57,6 +57,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)             */
@@ -161,9 +162,14 @@ typedef struct tapdev_info {
 
 typedef struct domid_translate {
 	unsigned short domid;
-	uint32_t busid;
+	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;