]> git.ipfire.org Git - thirdparty/valgrind.git/commitdiff
Add support for the FIOQSIZE ioctl. Fixes #270320.
authorTom Hughes <tom@compton.nu>
Wed, 10 Aug 2011 14:25:06 +0000 (14:25 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 10 Aug 2011 14:25:06 +0000 (14:25 +0000)
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11963

coregrind/m_syswrap/syswrap-linux.c
include/vki/vki-arm-linux.h
include/vki/vki-linux.h
include/vki/vki-ppc32-linux.h
include/vki/vki-ppc64-linux.h
include/vki/vki-s390x-linux.h

index 7add3ee8c5427372359cc0df3d021139ccd32e64..5cfa0180d77b7ada099c1e30ea52e5904b6feb7c 100644 (file)
@@ -4007,6 +4007,9 @@ PRE(sys_ioctl)
    case VKI_FIONREAD:                /* identical to SIOCINQ */
       PRE_MEM_WRITE( "ioctl(FIONREAD)",  ARG3, sizeof(int) );
       break;
+   case VKI_FIOQSIZE:
+      PRE_MEM_WRITE( "ioctl(FIOQSIZE)",  ARG3, sizeof(vki_loff_t) );
+      break;
 
    case VKI_TIOCSERGETLSR:
       PRE_MEM_WRITE( "ioctl(TIOCSERGETLSR)", ARG3, sizeof(int) );
@@ -5102,6 +5105,9 @@ POST(sys_ioctl)
    case VKI_FIONREAD:                /* identical to SIOCINQ */
       POST_MEM_WRITE( ARG3, sizeof(int) );
       break;
+   case VKI_FIOQSIZE:
+      POST_MEM_WRITE( ARG3, sizeof(vki_loff_t) );
+      break;
 
    case VKI_TIOCSERGETLSR:
       POST_MEM_WRITE( ARG3, sizeof(int) );
index 21ed4273938f2dd9fcd7271a144b8db460b02dee..4087f5e5041e7016eaa6245911b36f2bc4051f4c 100644 (file)
@@ -496,6 +496,12 @@ struct vki_termios {
 
 #define VKI_TIOCGICOUNT        0x545D  /* read serial port inline interrupt counts */
 
+//----------------------------------------------------------------------
+// From linux-2.6.39-rc2/arch/arm/include/asm/ioctls.h
+//----------------------------------------------------------------------
+
+#define VKI_FIOQSIZE 0x545E
+
 //----------------------------------------------------------------------
 // From asm-generic/poll.h
 //----------------------------------------------------------------------
index 13f1ffcb4fa7f5a6488fa2c33af5e836d7bcd75c..7aec781d884576c9e2f49f1b51791d7a70bc0821 100644 (file)
@@ -2751,6 +2751,14 @@ struct vki_getcpu_cache {
 #define VKI_EV_MAX             0x1f
 #define VKI_EV_CNT             (VKI_EV_MAX+1)
 
+//----------------------------------------------------------------------
+// From linux-2.6.39-rc2/include/asm_generic/ioctls.h
+//----------------------------------------------------------------------
+
+#ifndef VKI_FIOQSIZE
+#define VKI_FIOQSIZE 0x5460     /* Value differs on some platforms */
+#endif
+
 #endif // __VKI_LINUX_H
 
 /*--------------------------------------------------------------------*/
index 6b443860738dd8e33ead0b835f229d4115e0ea86..7ab8ff7713a685f61c6600434361080ccd5a70a5 100644 (file)
@@ -637,6 +637,12 @@ struct vki_termios {
 //#define VKI_TIOCMIWAIT       0x545C  /* wait for a change on serial input line(s) */
 #define VKI_TIOCGICOUNT                0x545D  /* read serial port inline interrupt counts */
 
+//----------------------------------------------------------------------
+// From linux-2.6.39-rc2/arch/powerpc/include/asm/ioctls.h
+//----------------------------------------------------------------------
+
+#define VKI_FIOQSIZE    VKI_IOR('f', 128, vki_loff_t)
+
 //----------------------------------------------------------------------
 // From linux-2.6.9/include/asm-ppc/poll.h
 //----------------------------------------------------------------------
index 5af8470f4ff4d716f73c61bb4eceb35a218b1d90..f813c34f8f7841df8915cd110cc3c7f14c72bf5b 100644 (file)
@@ -621,6 +621,12 @@ struct vki_termios {
 #define VKI_TIOCSERGETLSR   0x5459 /* Get line status register */
 #define VKI_TIOCGICOUNT            0x545D /* read serial port inline interrupt counts */
 
+//----------------------------------------------------------------------
+// From linux-2.6.39-rc2/arch/powerpc/include/asm/ioctls.h
+//----------------------------------------------------------------------
+
+#define VKI_FIOQSIZE    VKI_IOR('f', 128, vki_loff_t)
+
 //----------------------------------------------------------------------
 // From linux-2.6.13/include/asm-ppc64/poll.h
 //----------------------------------------------------------------------
index ccc73a4c434ed1867909ccc7380e22b2766e772e..2b5b8615be742bef0c6971d8a8655581fc6592fb 100644 (file)
@@ -596,6 +596,11 @@ struct vki_termios {
 
 #define VKI_TIOCGICOUNT        0x545D  /* read serial port inline interrupt counts */
 
+//----------------------------------------------------------------------
+// From linux-2.6.39-rc2/arch/s390/include/asm/ioctls.h
+//----------------------------------------------------------------------
+
+#define VKI_FIOQSIZE 0x545E
 
 //----------------------------------------------------------------------
 // From linux-2.6.16.60/include/asm-s390/poll.h