From e74656a1349b5318905c8c3d081de779e70b1dae Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 1 Mar 2022 10:50:09 +0000
Subject: [PATCH] valgrind: Modify suppressions for extra stack frame

When running the OCaml bytecode tests, small but apparently
unimportant differences in the stack frames caused the existing
suppressions not to match.  Adding an extra "..." will ignore these
differences allowing the tests to pass.

Valgrind output before this commit (note "UnknownInlinedFun" frame):

==1733400== 79 (48 direct, 31 indirect) bytes in 1 blocks are definitely lost in loss record 320 of 518
==1733400==    at 0x484A464: calloc (vg_replace_malloc.c:1328)
==1733400==    by 0x59685D0: g_malloc0 (gmem.c:136)
==1733400==    by 0x531BB59: virClassNew (virobject.c:191)
==1733400==    by 0x553A3BF: UnknownInlinedFun (datatypes.c:110)
==1733400==    by 0x553A3BF: virDataTypesOnce (datatypes.c:121)
==1733400==    by 0x49EA0C8: __pthread_once_slow (pthread_once.c:116)
==1733400==    by 0x53312E9: virOnce (virthread.c:44)
==1733400==    by 0x553A74A: UnknownInlinedFun (datatypes.c:121)
==1733400==    by 0x553A74A: virGetConnect (datatypes.c:133)
==1733400==    by 0x54FA94F: virConnectOpenInternal (libvirt.c:895)
==1733400==    by 0x54FB883: virConnectOpenAuth (libvirt.c:1277)
==1733400==    by 0x50E842A: guestfs_int_open_libvirt_connection.constprop.0 (libvirt-auth.c:224)
==1733400==    by 0x50C6120: launch_libvirt.lto_priv.0 (launch-libvirt.c:390)
==1733400==    by 0x5040E30: UnknownInlinedFun (launch.c:114)
==1733400==    by 0x5040E30: guestfs_launch (actions-3.c:513)
==1733400==
==1733400== 256 bytes in 1 blocks are definitely lost in loss record 481 of 518
==1733400==    at 0x484586F: malloc (vg_replace_malloc.c:381)
==1733400==    by 0x137A0E: UnknownInlinedFun (memory.c:824)
==1733400==    by 0x137A0E: caml_executable_name (unix.c:367)
==1733400==    by 0x14C224: UnknownInlinedFun (startup_byt.c:502)
==1733400==    by 0x14C224: caml_main (startup_byt.c:457)
==1733400==    by 0x11CEE1: main (main.c:41)
---
 valgrind-suppressions | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/valgrind-suppressions b/valgrind-suppressions
index df77bd95e..f502d4bd1 100644
--- a/valgrind-suppressions
+++ b/valgrind-suppressions
@@ -167,6 +167,7 @@
    caml_executable_name
    Memcheck:Leak
    fun:malloc
+   ...
    fun:caml_executable_name
    fun:caml_main
 }
@@ -297,6 +298,7 @@
    ...
    fun:g_malloc0
    fun:virClassNew
+   ...
    fun:virDataTypesOnce
 }