Halaman utama Jelajahi Bantuan
Masuk
PUBLIC_REPOS
/
buildroot
cermin dari git://git.buildroot.net/buildroot
2
1
Fork 0
Berkas
Pohon: e23be36ab3
Ranting Tag
buildroot
/
package
/
valgrind
/
valgrind-3.7.0-more-ioctls.patch

valgrind-3.7.0-more-ioctls.patch 7.3 KB
Riwayat Mentahan

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203 
  1. Add various ioctl()s
    2. 

  2. 

  3. Patch initially written by Eric Andersen <andersen@codepoet.org>.
    4. 

  4. 

  5. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
    6. 

  6. 

  7. Index: valgrind-3.7.0/coregrind/m_syswrap/syswrap-linux.c
    8. 

  8. ===================================================================
    9. 

  9. --- valgrind-3.7.0.orig/coregrind/m_syswrap/syswrap-linux.c	2011-10-27 12:55:05.000000000 +0200
    10. 

  10. +++ valgrind-3.7.0/coregrind/m_syswrap/syswrap-linux.c	2011-12-22 14:53:16.258126390 +0100
    11. 

  11. @@ -4058,7 +4058,33 @@
    12. 

  12.     case VKI_SG_GET_SG_TABLESIZE: /* 0x227f */
    13. 

  13.        PRE_MEM_WRITE( "ioctl(SG_GET_SG_TABLESIZE)", ARG3, sizeof(int) );
    14. 

  14.        break;
    15. 

  15. +   case VKI_SCSI_IOCTL_GET_IDLUN:
    16. 

  16. +      PRE_MEM_WRITE( "ioctl(SCSI_IOCTL_GET_IDLUN)", ARG3, sizeof(vki_scsi_idlun_t) );
    17. 

  17. +      break;
    18. 

  18. +   case VKI_SCSI_IOCTL_PROBE_HOST:
    19. 

  19. +      {
    20. 

  20. +	  int arraylen;
    21. 

  21. +	  char *array = (char*)ARG3;
    22. 

  22. +	  PRE_MEM_READ("ioctl(SCSI_IOCTL_PROBE_HOST)",  ARG3, sizeof(char)*4 );
    23. 

  23. +	  arraylen = array[0] + (array[1]<<8) + (array[2]<<16) + (array[3]<<24);
    24. 

  24. +	  PRE_MEM_WRITE( "ioctl(SCSI_IOCTL_PROBE_HOST)", ARG3, sizeof(char)*arraylen );
    25. 

  25. +      }
    26. 

  26. +      break;
    27. 

  27. +   case VKI_SCSI_IOCTL_GET_BUS_NUMBER:
    28. 

  28. +      PRE_MEM_WRITE( "ioctl(SCSI_IOCTL_GET_BUS_NUMBER)", ARG3, sizeof(int) );
    29. 

  29. +      break;
    30. 

  30.  
    31. 

  31. +   case VKI_FDRESET:
    32. 

  32. +      break;
    33. 

  33. +   case VKI_FDGETDRVTYP:
    34. 

  34. +      PRE_MEM_WRITE( "ioctl(FDGETDRVTYP)", ARG3, sizeof(char)*16 );
    35. 

  35. +      break;
    36. 

  36. +   case VKI_FDPOLLDRVSTAT:
    37. 

  37. +      PRE_MEM_WRITE( "ioctl(FDPOLLDRVSTAT)", ARG3, sizeof(vki_floppy_drive_struct_t) );
    38. 

  38. +      break;
    39. 

  39. +   case VKI_FDGETPRM:
    40. 

  40. +      PRE_MEM_WRITE( "ioctl(FDGETPRM)", ARG3, sizeof(vki_floppy_struct_t) );
    41. 

  41. +      break;
    42. 

  42.     case VKI_IIOCGETCPS:
    43. 

  43.        PRE_MEM_WRITE( "ioctl(IIOCGETCPS)", ARG3,
    44. 

  44.  		     VKI_ISDN_MAX_CHANNELS * 2 * sizeof(unsigned long) );
    45. 

  45. @@ -4373,6 +4399,8 @@
    46. 

  46.     case VKI_BLKROGET:
    47. 

  47.        PRE_MEM_WRITE( "ioctl(BLKROGET)", ARG3, sizeof(int));
    48. 

  48.        break;
    49. 

  49. +   case VKI_BLKRRPART:
    50. 

  50. +      break;
    51. 

  51.     case VKI_BLKGETSIZE:
    52. 

  52.        PRE_MEM_WRITE( "ioctl(BLKGETSIZE)", ARG3, sizeof(unsigned long));
    53. 

  53.        break;
    54. 

  54. @@ -4381,6 +4409,8 @@
    55. 

  55.     case VKI_BLKRAGET:
    56. 

  56.        PRE_MEM_WRITE( "ioctl(BLKRAGET)", ARG3, sizeof(long));
    57. 

  57.        break;
    58. 

  58. +   case VKI_BLKFLSBUF:
    59. 

  59. +      break;
    60. 

  60.     case VKI_BLKFRASET:
    61. 

  61.        break;
    62. 

  62.     case VKI_BLKFRAGET:
    63. 

  63. @@ -4447,6 +4477,8 @@
    64. 

  64.        PRE_MEM_WRITE( "ioctl(CDROMREADTOCENTRY)", ARG3, 
    65. 

  65.  		     sizeof(struct vki_cdrom_tocentry));
    66. 

  66.        break;
    67. 

  67. +   case VKI_CDROMEJECT:
    68. 

  68. +      break;
    69. 

  69.     case VKI_CDROMMULTISESSION: /* 0x5310 */
    70. 

  70.        PRE_MEM_WRITE( "ioctl(CDROMMULTISESSION)", ARG3,
    71. 

  71.  		     sizeof(struct vki_cdrom_multisession));
    72. 

  72. @@ -5321,7 +5353,28 @@
    73. 

  73.     case VKI_SG_GET_SG_TABLESIZE:
    74. 

  74.        POST_MEM_WRITE(ARG3, sizeof(int));
    75. 

  75.        break;      
    76. 

  76. +   case VKI_SCSI_IOCTL_GET_IDLUN:
    77. 

  77. +      POST_MEM_WRITE(ARG3, sizeof(vki_scsi_idlun_t));
    78. 

  78. +      break;
    79. 

  79. +   case VKI_SCSI_IOCTL_PROBE_HOST:
    80. 

  80. +      if (RES > 0 && ARG3 )
    81. 

  81. +	  POST_MEM_WRITE(ARG3, sizeof(char)*RES);
    82. 

  82. +      break;
    83. 

  83. +   case VKI_SCSI_IOCTL_GET_BUS_NUMBER:
    84. 

  84. +      POST_MEM_WRITE(ARG3, sizeof(int));
    85. 

  85. +      break;
    86. 

  86.  
    87. 

  87. +   case VKI_FDRESET:
    88. 

  88. +      break;
    89. 

  89. +   case VKI_FDGETDRVTYP:
    90. 

  90. +      POST_MEM_WRITE( ARG3, sizeof(char)*16 );
    91. 

  91. +      break;
    92. 

  92. +   case VKI_FDPOLLDRVSTAT:
    93. 

  93. +      POST_MEM_WRITE( ARG3, sizeof(vki_floppy_drive_struct_t) );
    94. 

  94. +      break;
    95. 

  95. +   case VKI_FDGETPRM:
    96. 

  96. +      POST_MEM_WRITE( ARG3, sizeof(vki_floppy_struct_t) );
    97. 

  97. +      break;
    98. 

  98.     case VKI_IIOCGETCPS:
    99. 

  99.        POST_MEM_WRITE( ARG3, VKI_ISDN_MAX_CHANNELS * 2 * sizeof(unsigned long) );
    100. 

  100.        break;
    101. 

  101. @@ -5542,6 +5595,8 @@
    102. 

  102.     case VKI_BLKROGET:
    103. 

  103.        POST_MEM_WRITE(ARG3, sizeof(int));
    104. 

  104.        break;
    105. 

  105. +   case VKI_BLKRRPART:
    106. 

  106. +      break;
    107. 

  107.     case VKI_BLKGETSIZE:
    108. 

  108.        POST_MEM_WRITE(ARG3, sizeof(unsigned long));
    109. 

  109.        break;
    110. 

  110. @@ -5550,6 +5605,8 @@
    111. 

  111.     case VKI_BLKRAGET:
    112. 

  112.        POST_MEM_WRITE(ARG3, sizeof(long));
    113. 

  113.        break;
    114. 

  114. +   case VKI_BLKFLSBUF:
    115. 

  115. +      break;
    116. 

  116.     case VKI_BLKFRASET:
    117. 

  117.        break;
    118. 

  118.     case VKI_BLKFRAGET:
    119. 

  119. @@ -5591,6 +5648,8 @@
    120. 

  120.     case VKI_CDROMREADTOCENTRY:
    121. 

  121.        POST_MEM_WRITE(ARG3, sizeof(struct vki_cdrom_tocentry));
    122. 

  122.        break;
    123. 

  123. +   case VKI_CDROMEJECT:
    124. 

  124. +      break;
    125. 

  125.     case VKI_CDROMMULTISESSION:
    126. 

  126.        POST_MEM_WRITE(ARG3, sizeof(struct vki_cdrom_multisession));
    127. 

  127.        break;
    128. 

  128. Index: valgrind-3.7.0/include/vki/vki-linux.h
    129. 

  129. ===================================================================
    130. 

  130. --- valgrind-3.7.0.orig/include/vki/vki-linux.h	2011-10-26 23:24:31.000000000 +0200
    131. 

  131. +++ valgrind-3.7.0/include/vki/vki-linux.h	2011-12-22 14:53:16.258126390 +0100
    132. 

  132. @@ -1654,7 +1654,9 @@
    133. 

  133.  
    134. 

  134.  #define VKI_BLKROSET   _VKI_IO(0x12,93)	/* set device read-only (0 = read-write) */
    135. 

  135.  #define VKI_BLKROGET   _VKI_IO(0x12,94)	/* get read-only status (0 = read_write) */
    136. 

  136. +#define VKI_BLKRRPART  _VKI_IO(0x12,95) /* re-read partition table */
    137. 

  137.  #define VKI_BLKGETSIZE _VKI_IO(0x12,96) /* return device size /512 (long *arg) */
    138. 

  138. +#define VKI_BLKFLSBUF  _VKI_IO(0x12,97) /* flush buffer cache */
    139. 

  139.  #define VKI_BLKRASET   _VKI_IO(0x12,98)	/* set read ahead for block device */
    140. 

  140.  #define VKI_BLKRAGET   _VKI_IO(0x12,99)	/* get current read ahead setting */
    141. 

  141.  #define VKI_BLKFRASET  _VKI_IO(0x12,100)/* set filesystem (mm/filemap.c) read-ahead */
    142. 

  142. @@ -1729,6 +1731,53 @@
    143. 

  143.  //#define SG_GET_COMMAND_Q 0x2270   /* Yields 0 (queuing off) or 1 (on) */
    144. 

  144.  #define VKI_SG_SET_COMMAND_Q 0x2271   /* Change queuing state with 0 or 1 */
    145. 

  145.  
    146. 

  146. +typedef struct vki_scsi_idlun
    147. 

  147. +{
    148. 

  148. +    int mux4;
    149. 

  149. +    int host_unique_id;
    150. 

  150. +
    151. 

  151. +} vki_scsi_idlun_t;
    152. 

  152. +#define VKI_SCSI_IOCTL_GET_IDLUN 0x5382		/* Gets a struct vki_scsi_idlun */
    153. 

  153. +#define VKI_SCSI_IOCTL_PROBE_HOST 0x5385	/* Gets an arrary describing the SCSI host */
    154. 

  154. +#define VKI_SCSI_IOCTL_GET_BUS_NUMBER 0x5386	/* Get the bus number for a device */
    155. 

  155. +
    156. 

  156. +//----------------------------------------------------------------------
    157. 

  157. +// From linux-2.6.8.1/include/linux/fd.h
    158. 

  158. +//----------------------------------------------------------------------
    159. 

  159. +#define VKI_FDRESET 0x254		/* Takes an int by value */
    160. 

  160. +#define VKI_FDGETDRVTYP 0x20f	/* Returns char floppy_drive_name[16] */
    161. 

  161. +typedef struct vki_floppy_drive_struct {
    162. 

  162. +	unsigned long flags;
    163. 

  163. +	unsigned long spinup_date;
    164. 

  164. +	unsigned long select_date;
    165. 

  165. +	unsigned long first_read_date;
    166. 

  166. +	short probed_format;
    167. 

  167. +	short track;
    168. 

  168. +	short maxblock;
    169. 

  169. +	short maxtrack;
    170. 

  170. +	int generation;
    171. 

  171. +	int keep_data;
    172. 

  172. +	int fd_ref;
    173. 

  173. +	int fd_device;
    174. 

  174. +	unsigned long last_checked;
    175. 

  175. +	char *dmabuf;
    176. 

  176. +	int bufblocks;
    177. 

  177. +} vki_floppy_drive_struct_t;
    178. 

  178. +#define VKI_FDPOLLDRVSTAT 0x213	    /* returns a struct floppy_drive_struct */
    179. 

  179. +typedef struct vki_floppy_struct {
    180. 

  180. +	unsigned int	size;
    181. 

  181. +	unsigned int	sect;
    182. 

  182. +	unsigned int	head;
    183. 

  183. +	unsigned int	track;
    184. 

  184. +	unsigned int	stretch;
    185. 

  185. +	unsigned char	gap;
    186. 

  186. +	unsigned char	rate;
    187. 

  187. +	unsigned char	spec1;
    188. 

  188. +	unsigned char	fmt_gap;
    189. 

  189. +	const char	* name;
    190. 

  190. +} vki_floppy_struct_t;
    191. 

  191. +#define VKI_FDGETPRM 0x204	    /* returns a struct floppy_struct */
    192. 

  192. +
    193. 

  193.  //----------------------------------------------------------------------
    194. 

  194.  // From linux-2.6.8.1/include/linux/cdrom.h
    195. 

  195.  //----------------------------------------------------------------------
    196. 

  196. @@ -1738,6 +1787,7 @@
    197. 

  197.                                             (struct cdrom_tochdr) */
    198. 

  198.  #define VKI_CDROMREADTOCENTRY	0x5306 /* Read TOC entry 
    199. 

  199.                                             (struct cdrom_tocentry) */
    200. 

  200. +#define VKI_CDROMEJECT		0x5309 /* Eject cdrom media */
    201. 

  201.  #define VKI_CDROMSUBCHNL	0x530b /* Read subchannel data 
    202. 

  202.                                             (struct cdrom_subchnl) */
    203. 

  203.  #define VKI_CDROMREADMODE2	0x530c /* Read CDROM mode 2 data (2336 Bytes) 
    204.