|
From: <sv...@va...> - 2011-08-10 14:29:55
|
Author: tom
Date: 2011-08-10 15:25:06 +0100 (Wed, 10 Aug 2011)
New Revision: 11963
Log:
Add support for the FIOQSIZE ioctl. Fixes #270320.
Modified:
trunk/coregrind/m_syswrap/syswrap-linux.c
trunk/include/vki/vki-arm-linux.h
trunk/include/vki/vki-linux.h
trunk/include/vki/vki-ppc32-linux.h
trunk/include/vki/vki-ppc64-linux.h
trunk/include/vki/vki-s390x-linux.h
Modified: trunk/coregrind/m_syswrap/syswrap-linux.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-linux.c 2011-08-10 12:58:23 UTC (rev 11962)
+++ trunk/coregrind/m_syswrap/syswrap-linux.c 2011-08-10 14:25:06 UTC (rev 11963)
@@ -4007,6 +4007,9 @@
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 @@
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) );
Modified: trunk/include/vki/vki-arm-linux.h
===================================================================
--- trunk/include/vki/vki-arm-linux.h 2011-08-10 12:58:23 UTC (rev 11962)
+++ trunk/include/vki/vki-arm-linux.h 2011-08-10 14:25:06 UTC (rev 11963)
@@ -497,6 +497,12 @@
#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
//----------------------------------------------------------------------
Modified: trunk/include/vki/vki-linux.h
===================================================================
--- trunk/include/vki/vki-linux.h 2011-08-10 12:58:23 UTC (rev 11962)
+++ trunk/include/vki/vki-linux.h 2011-08-10 14:25:06 UTC (rev 11963)
@@ -2751,6 +2751,14 @@
#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
/*--------------------------------------------------------------------*/
Modified: trunk/include/vki/vki-ppc32-linux.h
===================================================================
--- trunk/include/vki/vki-ppc32-linux.h 2011-08-10 12:58:23 UTC (rev 11962)
+++ trunk/include/vki/vki-ppc32-linux.h 2011-08-10 14:25:06 UTC (rev 11963)
@@ -638,6 +638,12 @@
#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
//----------------------------------------------------------------------
Modified: trunk/include/vki/vki-ppc64-linux.h
===================================================================
--- trunk/include/vki/vki-ppc64-linux.h 2011-08-10 12:58:23 UTC (rev 11962)
+++ trunk/include/vki/vki-ppc64-linux.h 2011-08-10 14:25:06 UTC (rev 11963)
@@ -622,6 +622,12 @@
#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
//----------------------------------------------------------------------
Modified: trunk/include/vki/vki-s390x-linux.h
===================================================================
--- trunk/include/vki/vki-s390x-linux.h 2011-08-10 12:58:23 UTC (rev 11962)
+++ trunk/include/vki/vki-s390x-linux.h 2011-08-10 14:25:06 UTC (rev 11963)
@@ -596,7 +596,12 @@
#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
//----------------------------------------------------------------------
|