From c46c27fd34ea7b4e7964f02df3be671a1337e22b Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 30 Jun 2013 07:57:35 +0000 Subject: [PATCH] [PATCH 1/4] xen: distinguish the various fields of the Xen privcmd ioctls in the logging (#321065) From: Ian Campbell git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13435 --- coregrind/m_syswrap/syswrap-linux.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c index a42a5721e..039f8d4d9 100644 --- a/coregrind/m_syswrap/syswrap-linux.c +++ b/coregrind/m_syswrap/syswrap-linux.c @@ -6508,37 +6508,37 @@ PRE(sys_ioctl) case VKI_XEN_IOCTL_PRIVCMD_MMAP: { struct vki_xen_privcmd_mmap *args = (struct vki_xen_privcmd_mmap *)(ARG3); - PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAP", + PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAP(num)", (Addr)&args->num, sizeof(args->num)); - PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAP", + PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAP(dom)", (Addr)&args->dom, sizeof(args->dom)); - PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAP", + PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAP(entry)", (Addr)args->entry, sizeof(*(args->entry)) * args->num); break; } case VKI_XEN_IOCTL_PRIVCMD_MMAPBATCH: { struct vki_xen_privcmd_mmapbatch *args = (struct vki_xen_privcmd_mmapbatch *)(ARG3); - PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAPBATCH", + PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAPBATCH(num)", (Addr)&args->num, sizeof(args->num)); - PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAPBATCH", + PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAPBATCH(dom)", (Addr)&args->dom, sizeof(args->dom)); - PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAPBATCH", + PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAPBATCH(addr)", (Addr)&args->addr, sizeof(args->addr)); - PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAPBATCH", + PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAPBATCH(arr)", (Addr)args->arr, sizeof(*(args->arr)) * args->num); break; } case VKI_XEN_IOCTL_PRIVCMD_MMAPBATCH_V2: { struct vki_xen_privcmd_mmapbatch_v2 *args = (struct vki_xen_privcmd_mmapbatch_v2 *)(ARG3); - PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAPBATCH_V2", + PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAPBATCH_V2(num)", (Addr)&args->num, sizeof(args->num)); - PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAPBATCH_V2", + PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAPBATCH_V2(dom)", (Addr)&args->dom, sizeof(args->dom)); - PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAPBATCH_V2", + PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAPBATCH_V2(addr)", (Addr)&args->addr, sizeof(args->addr)); - PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAPBATCH_V2", + PRE_MEM_READ("VKI_XEN_IOCTL_PRIVCMD_MMAPBATCH_V2(arr)", (Addr)args->arr, sizeof(*(args->arr)) * args->num); break; }