|
From: <sv...@va...> - 2014-08-05 15:15:04
|
Author: cborntra
Date: Tue Aug 5 15:14:52 2014
New Revision: 14235
Log:
add support for VKI_BLKDISCARDZEROES
this is used in some newer QEMU versions and other tools
Modified:
trunk/NEWS
trunk/coregrind/m_syswrap/syswrap-linux.c
trunk/include/vki/vki-linux.h
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Tue Aug 5 15:14:52 2014
@@ -209,6 +209,7 @@
n-i-bz Fix mingw64 support in valgrind.h (dev@, 9 May 2014)
n-i-bz drd manual: Document how to C++11 programs that use class "std::thread"
n-i-bz Add command-line option --default-suppressions
+n-i-bz Add support for BLKDISCARDZEROES ioctl
Release 3.9.0 (31 October 2013)
Modified: trunk/coregrind/m_syswrap/syswrap-linux.c
==============================================================================
--- trunk/coregrind/m_syswrap/syswrap-linux.c (original)
+++ trunk/coregrind/m_syswrap/syswrap-linux.c Tue Aug 5 15:14:52 2014
@@ -6087,6 +6087,9 @@
case VKI_BLKPBSZGET:
PRE_MEM_WRITE( "ioctl(BLKPBSZGET)", ARG3, sizeof(int));
break;
+ case VKI_BLKDISCARDZEROES:
+ PRE_MEM_WRITE( "ioctl(BLKDISCARDZEROES)", ARG3, sizeof(vki_uint));
+ break;
/* Hard disks */
case VKI_HDIO_GETGEO: /* 0x0301 */
@@ -7694,6 +7697,9 @@
case VKI_BLKPBSZGET:
POST_MEM_WRITE(ARG3, sizeof(int));
break;
+ case VKI_BLKDISCARDZEROES:
+ POST_MEM_WRITE(ARG3, sizeof(vki_uint));
+ break;
/* Hard disks */
case VKI_HDIO_GETGEO: /* 0x0301 */
Modified: trunk/include/vki/vki-linux.h
==============================================================================
--- trunk/include/vki/vki-linux.h (original)
+++ trunk/include/vki/vki-linux.h Tue Aug 5 15:14:52 2014
@@ -1720,7 +1720,7 @@
#define VKI_PPSETFLAGS _VKI_IOW(VKI_PP_IOCTL, 0x9b, int)
//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/linux/fs.h
+// From linux-3.16/include/uapi/linux/fs.h
//----------------------------------------------------------------------
#define VKI_BLKROSET _VKI_IO(0x12,93) /* set device read-only (0 = read-write) */
@@ -1736,6 +1736,7 @@
#define VKI_BLKBSZSET _VKI_IOW(0x12,113,vki_size_t)
#define VKI_BLKGETSIZE64 _VKI_IOR(0x12,114,vki_size_t) /* return device size in bytes (u64 *arg) */
#define VKI_BLKPBSZGET _VKI_IO(0x12,123)
+#define VKI_BLKDISCARDZEROES _VKI_IO(0x12,124)
#define VKI_FIBMAP _VKI_IO(0x00,1) /* bmap access */
#define VKI_FIGETBSZ _VKI_IO(0x00,2) /* get the block size used for bmap */
|