|
From: <sv...@va...> - 2014-06-26 13:15:08
|
Author: tom
Date: Thu Jun 26 13:14:56 2014
New Revision: 14112
Log:
Add SIOCATMARK ioctl support.
Patch from Austin English via BZ#335441.
Modified:
trunk/NEWS
trunk/coregrind/m_syswrap/syswrap-linux.c
trunk/docs/internals/3_9_BUGSTATUS.txt
trunk/include/vki/vki-amd64-linux.h
trunk/include/vki/vki-arm-linux.h
trunk/include/vki/vki-arm64-linux.h
trunk/include/vki/vki-mips32-linux.h
trunk/include/vki/vki-mips64-linux.h
trunk/include/vki/vki-ppc32-linux.h
trunk/include/vki/vki-ppc64-linux.h
trunk/include/vki/vki-s390x-linux.h
trunk/include/vki/vki-x86-linux.h
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Thu Jun 26 13:14:56 2014
@@ -165,6 +165,7 @@
335155 vgdb, fix error print statement.
335262 arm64: movi 8bit version is not supported
335263 arm64: dmb instruction is not implemented
+335441 unhandled ioctl 0x8905 (SIOCATMARK) when running wine under valgrind
335496 arm64: sbc/abc instructions are not implemented
n-i-bz Fix KVM_CREATE_IRQCHIP ioctl handling
n-i-bz s390x: Fix memory corruption for multithreaded applications
Modified: trunk/coregrind/m_syswrap/syswrap-linux.c
==============================================================================
--- trunk/coregrind/m_syswrap/syswrap-linux.c (original)
+++ trunk/coregrind/m_syswrap/syswrap-linux.c Thu Jun 26 13:14:56 2014
@@ -6038,6 +6038,10 @@
//tst->sys_flags &= ~SfMayBlock;
break;
+ case VKI_SIOCATMARK:
+ PRE_MEM_READ( "ioctl(SIOCATMARK)", ARG3, sizeof(int) );
+ break;
+
/* linux/soundcard interface (OSS) */
case VKI_SNDCTL_SEQ_GETOUTCOUNT:
case VKI_SNDCTL_SEQ_GETINCOUNT:
@@ -7414,6 +7418,10 @@
case VKI_SIOCSPGRP:
break;
+ case VKI_SIOCATMARK:
+ POST_MEM_WRITE(ARG3, sizeof(int));
+ break;
+
/* linux/soundcard interface (OSS) */
case VKI_SNDCTL_SEQ_GETOUTCOUNT:
case VKI_SNDCTL_SEQ_GETINCOUNT:
Modified: trunk/docs/internals/3_9_BUGSTATUS.txt
==============================================================================
--- trunk/docs/internals/3_9_BUGSTATUS.txt (original)
+++ trunk/docs/internals/3_9_BUGSTATUS.txt Thu Jun 26 13:14:56 2014
@@ -179,7 +179,6 @@
334834 PPC64 Little Endian support, patch 2
334836 PPC64 Little Endian support, patch 3 testcase fixes
335353 expected output of exp-sgcheck/tests/hackedbz2 mismatch with gcc 4.8.1
-335441 unhandled ioctl 0x8905 (SIOCATMARK) when running wine under valgrind (patch)
249435 Analyzing wine programs with callgrind triggers a crash (NEEDS CLOSE)
335563 wine's kernel32/thread test fails under valgrind
335618 arm(thumb): unhanded instruction: mov.w rN, pc/sp
Modified: trunk/include/vki/vki-amd64-linux.h
==============================================================================
--- trunk/include/vki/vki-amd64-linux.h (original)
+++ trunk/include/vki/vki-amd64-linux.h Thu Jun 26 13:14:56 2014
@@ -311,6 +311,7 @@
#define VKI_SIOCSPGRP 0x8902
#define VKI_SIOCGPGRP 0x8904
+#define VKI_SIOCATMARK 0x8905
#define VKI_SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
#define VKI_SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
Modified: trunk/include/vki/vki-arm-linux.h
==============================================================================
--- trunk/include/vki/vki-arm-linux.h (original)
+++ trunk/include/vki/vki-arm-linux.h Thu Jun 26 13:14:56 2014
@@ -313,6 +313,7 @@
#define VKI_SIOCSPGRP 0x8902
#define VKI_SIOCGPGRP 0x8904
+#define VKI_SIOCATMARK 0x8905
#define VKI_SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
#define VKI_SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
Modified: trunk/include/vki/vki-arm64-linux.h
==============================================================================
--- trunk/include/vki/vki-arm64-linux.h (original)
+++ trunk/include/vki/vki-arm64-linux.h Thu Jun 26 13:14:56 2014
@@ -284,6 +284,7 @@
#define VKI_SIOCSPGRP 0x8902
#define VKI_SIOCGPGRP 0x8904
+#define VKI_SIOCATMARK 0x8905
#define VKI_SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
#define VKI_SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
Modified: trunk/include/vki/vki-mips32-linux.h
==============================================================================
--- trunk/include/vki/vki-mips32-linux.h (original)
+++ trunk/include/vki/vki-mips32-linux.h Thu Jun 26 13:14:56 2014
@@ -382,6 +382,7 @@
#define VKI_SIOCSPGRP 0x8902
#define VKI_SIOCGPGRP 0x8904
+#define VKI_SIOCATMARK 0x8905
#define VKI_SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
#define VKI_SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
Modified: trunk/include/vki/vki-mips64-linux.h
==============================================================================
--- trunk/include/vki/vki-mips64-linux.h (original)
+++ trunk/include/vki/vki-mips64-linux.h Thu Jun 26 13:14:56 2014
@@ -387,6 +387,7 @@
#define VKI_SIOCSPGRP 0x8902
#define VKI_SIOCGPGRP 0x8904
+#define VKI_SIOCATMARK 0x8905
#define VKI_SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
#define VKI_SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
Modified: trunk/include/vki/vki-ppc32-linux.h
==============================================================================
--- trunk/include/vki/vki-ppc32-linux.h (original)
+++ trunk/include/vki/vki-ppc32-linux.h Thu Jun 26 13:14:56 2014
@@ -380,6 +380,7 @@
#define VKI_SIOCSPGRP 0x8902
#define VKI_SIOCGPGRP 0x8904
+#define VKI_SIOCATMARK 0x8905
#define VKI_SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
#define VKI_SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
Modified: trunk/include/vki/vki-ppc64-linux.h
==============================================================================
--- trunk/include/vki/vki-ppc64-linux.h (original)
+++ trunk/include/vki/vki-ppc64-linux.h Thu Jun 26 13:14:56 2014
@@ -431,6 +431,7 @@
#define VKI_SIOCSPGRP 0x8902
#define VKI_SIOCGPGRP 0x8904
+#define VKI_SIOCATMARK 0x8905
#define VKI_SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
#define VKI_SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
Modified: trunk/include/vki/vki-s390x-linux.h
==============================================================================
--- trunk/include/vki/vki-s390x-linux.h (original)
+++ trunk/include/vki/vki-s390x-linux.h Thu Jun 26 13:14:56 2014
@@ -377,6 +377,7 @@
#define VKI_SIOCSPGRP 0x8902
#define VKI_SIOCGPGRP 0x8904
+#define VKI_SIOCATMARK 0x8905
#define VKI_SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
/* since 2.6.22 */
#define VKI_SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
Modified: trunk/include/vki/vki-x86-linux.h
==============================================================================
--- trunk/include/vki/vki-x86-linux.h (original)
+++ trunk/include/vki/vki-x86-linux.h Thu Jun 26 13:14:56 2014
@@ -351,6 +351,7 @@
#define VKI_SIOCSPGRP 0x8902
#define VKI_SIOCGPGRP 0x8904
+#define VKI_SIOCATMARK 0x8905
#define VKI_SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
#define VKI_SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
|