Be quieter when outputting XML.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3910

diff --git a/coregrind/m_syscalls/syscalls-generic.c b/coregrind/m_syscalls/syscalls-generic.c
index 8d53deb67e4bb8c64b73a79f0a35ae6e38d6e4a2..b2f55929a18b248a2d2c9c22f8763df34240d37f 100644 (file)
--- a/coregrind/m_syscalls/syscalls-generic.c
+++ b/coregrind/m_syscalls/syscalls-generic.c
@@ -3786,7 +3786,7 @@ PRE(sys_ioctl)
          */
       } else if (/* size == 0 || */ dir == _VKI_IOC_NONE) {
         static Int moans = 3;
-        if (moans > 0) {
+        if (moans > 0 && !VG_(clo_xml)) {
            moans--;
            VG_(message)(Vg_UserMsg, 
                         "Warning: noted but unhandled ioctl 0x%x"

diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index 1c1a8034e603c994863765f0c5b15de3a967decd..ea8edef5e54150ec2a4aba8cc08eb30f263a0c85 100644 (file)
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -557,7 +557,7 @@ static void set_address_range_perms ( Addr aA, SizeT len,
    if (len == 0)
       return;
 
-   if (VG_(clo_verbosity) > 0) {
+   if (VG_(clo_verbosity) > 0 && !VG_(clo_xml)) {
       if (len > 100 * 1000 * 1000) {
          VG_(message)(Vg_UserMsg, 
                       "Warning: set address range perms: "