A couple more XML cases that slipped through the net.

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

diff --git a/coregrind/m_debuginfo/dwarf.c b/coregrind/m_debuginfo/dwarf.c
index 08e5f3c462cc4a679bf7d9a38794a4e0c61d5bc1..75dbc21052d1066ad5b2ecbc14d5f0814747b6a5 100644 (file)
--- a/coregrind/m_debuginfo/dwarf.c
+++ b/coregrind/m_debuginfo/dwarf.c
@@ -2486,7 +2486,8 @@ void ML_(read_callframe_info_dwarf2)
    return;
 
    bad:
-    VG_(message)(Vg_UserMsg, "Warning: %s in DWARF2 CFI reading", how);
+    if (!VG_(clo_xml))
+       VG_(message)(Vg_UserMsg, "Warning: %s in DWARF2 CFI reading", how);
     return;
 }
 

diff --git a/coregrind/m_errormgr.c b/coregrind/m_errormgr.c
index 0774120115218dc8d18aeab0292806bdcd988f1e..cf6cfb0253079e5f805877066ab5b927d61a59a5 100644 (file)
--- a/coregrind/m_errormgr.c
+++ b/coregrind/m_errormgr.c
@@ -465,7 +465,8 @@ void VG_(maybe_record_error) ( ThreadId tid,
       pointless to continue the Valgrind run after this point. */
    if (VG_(clo_error_limit) 
        && (n_errs_shown >= M_COLLECT_NO_ERRORS_AFTER_SHOWN
-           || n_errs_found >= M_COLLECT_NO_ERRORS_AFTER_FOUND)) {
+           || n_errs_found >= M_COLLECT_NO_ERRORS_AFTER_FOUND)
+       && !VG_(clo_xml)) {
       if (!stopping_message) {
          VG_(message)(Vg_UserMsg, "");
 
@@ -498,7 +499,8 @@ void VG_(maybe_record_error) ( ThreadId tid,
    /* After M_COLLECT_ERRORS_SLOWLY_AFTER different errors have
       been found, be much more conservative about collecting new
       ones. */
-   if (n_errs_shown >= M_COLLECT_ERRORS_SLOWLY_AFTER) {
+   if (n_errs_shown >= M_COLLECT_ERRORS_SLOWLY_AFTER
+       && !VG_(clo_xml)) {
       exe_res = Vg_LowRes;
       if (!slowdown_message) {
          VG_(message)(Vg_UserMsg, "");