File valgrind.xen-3.3-handle-IOCTL_GNTDEV_SET_MAX_GRANTS.patch of Package valgrind

From: Olaf Hering <olaf@aepfle.de>
Date: Fri, 16 Nov 2018 17:21:01 +0100
Subject: xen-3.3: handle IOCTL_GNTDEV_SET_MAX_GRANTS

bz#390553
---
 coregrind/m_syswrap/syswrap-linux.c | 10 +++++++++
 include/vki/vki-linux.h             |  6 +++++
 2 files changed, 16 insertions(+)

--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -9266,24 +9266,31 @@ PRE(sys_ioctl)
                   (Addr)&args->count, sizeof(args->count));
       PRE_MEM_READ("VKI_XEN_IOCTL_GNTDEV_map_grant_ref(pad)",
                   (Addr)&args->pad, sizeof(args->pad));
       }
       break;
    case VKI_XEN_IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR: {
       struct vki_xen_ioctl_gntdev_get_offset_for_vaddr *args =
          (struct vki_xen_ioctl_gntdev_get_offset_for_vaddr*)(Addr)(ARG3);
       PRE_MEM_READ("VKI_XEN_IOCTL_GNTDEV_map_grant_ref(vaddr)",
                   (Addr)&args->vaddr, sizeof(args->vaddr));
       }
       break;
+   case VKI_XEN_IOCTL_GNTDEV_SET_MAX_GRANTS: {
+      struct vki_xen_ioctl_gntdev_set_max_grants *args =
+         (struct vki_xen_ioctl_gntdev_set_max_grants*)(Addr)(ARG3);
+      PRE_MEM_READ("VKI_XEN_IOCTL_GNTDEV_set_max_grants(count)",
+                  (Addr)&args->count, sizeof(args->count));
+      }
+      break;
 #endif
 
    /* Lustre */
    case VKI_OBD_IOC_FID2PATH: {
       struct vki_getinfo_fid2path *gf =
          (struct vki_getinfo_fid2path *)(Addr)ARG3;
       PRE_MEM_READ("VKI_OBD_IOC_FID2PATH(args)", ARG3, sizeof(struct vki_getinfo_fid2path));
       PRE_FIELD_WRITE("VKI_OBD_IOC_FID2PATH(args).gf_recno", gf->gf_recno);
       PRE_FIELD_WRITE("VKI_OBD_IOC_FID2PATH(args).gf_linkno", gf->gf_linkno);
       PRE_MEM_WRITE("VKI_OBD_IOC_FID2PATH(args)", (Addr)gf->gf_path, gf->gf_pathlen);
       break;
    }
@@ -11960,24 +11967,27 @@ POST(sys_ioctl)
       }
       break;
    case VKI_XEN_IOCTL_GNTDEV_UNMAP_GRANT_REF:
       /* No output */
       break;
    case VKI_XEN_IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR: {
       struct vki_xen_ioctl_gntdev_get_offset_for_vaddr *args =
          (struct vki_xen_ioctl_gntdev_get_offset_for_vaddr*)(Addr)(ARG3);
       POST_FIELD_WRITE(args->count);
       POST_FIELD_WRITE(args->offset);
       }
       break;
+   case VKI_XEN_IOCTL_GNTDEV_SET_MAX_GRANTS:
+      /* No output */
+      break;
 #endif
 
    /* Lustre */
    case VKI_OBD_IOC_FID2PATH: {
        struct vki_getinfo_fid2path *args = (void *)(Addr)(ARG3);
        POST_FIELD_WRITE(args->gf_recno);
        POST_FIELD_WRITE(args->gf_linkno);
        POST_MEM_WRITE((Addr)args->gf_path, VG_(strlen)(args->gf_path)+1);
        break;
       }
 
    case VKI_LL_IOC_PATH2FID:
--- a/include/vki/vki-linux.h
+++ b/include/vki/vki-linux.h
@@ -3624,24 +3624,30 @@ struct vki_xen_ioctl_gntdev_unmap_grant_ref {
    vki_u32 pad;
 };
 
 #define VKI_XEN_IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR			\
 	_VKI_IOC(_VKI_IOC_NONE, 'G', 2, sizeof(struct vki_xen_ioctl_gntdev_get_offset_for_vaddr))
 struct vki_xen_ioctl_gntdev_get_offset_for_vaddr {
    __vki_u64 vaddr;
    __vki_u64 offset;
    vki_u32 count;
    vki_u32 pad;
 };
 
+#define VKI_XEN_IOCTL_GNTDEV_SET_MAX_GRANTS			\
+	_VKI_IOC(_VKI_IOC_NONE, 'G', 3, sizeof(struct vki_xen_ioctl_gntdev_set_max_grants))
+struct vki_xen_ioctl_gntdev_set_max_grants {
+   vki_u32 count;
+};
+
 //----------------------------------------------------------------------
 // From linux-3.4.0/include/linux/fs.h
 //----------------------------------------------------------------------
 
 struct vki_file_handle {
    __vki_u32 handle_bytes;
    int handle_type;
    /* file identifier */
    unsigned char f_handle[0];
 };
 
 //----------------------------------------------------------------------