On Thu, Jan 16, 2020 at 12:43:39PM +0100, Philippe Mathieu-Daudé wrote: > Adding the same directory multiple times to trace-events-subdirs > might trigger build failures, in particular when using the LTTng > Userspace Tracer library as backend. > > For example when using two times the hw/core/ directory: > > $ ./configure --enable-trace-backends=ust && make > [...] > CC trace-ust-all.o > In file included from trace-ust-all.h:13, > from trace-ust-all.c:13: > trace-ust-all.h:35151:1: error: redefinition of > ‘__tracepoint_cb_qemu___loader_write_rom’ > 35151 | TRACEPOINT_EVENT( > | ^~~~~~~~~~~~~~~~ > trace-ust-all.h:31791:1: note: previous definition of > ‘__tracepoint_cb_qemu___loader_write_rom’ was here > 31791 | TRACEPOINT_EVENT( > | ^~~~~~~~~~~~~~~~ > > To ease review and reduce likelihood of merge failures (see [*]), > keep trace-events-subdirs ordered when possible, following eb7ccb3c0. > > [*] https://www.mail-archive.com/qemu-devel@nongnu.org/msg671007.html > Duplicate trace-events-subdirs entries generates duplicated > symbols when using the LTTng Userspace Tracer library. > > Reviewed-by: Damien Hedde <damien.he...@greensocs.com> > Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > v2: Add build log error in commit description (lvivier) > > "Fixes: 26b8e6dc & 8d5d515a0" > > To be even safer we should use $(sort $(trace-events-subdirs)) > --- > Makefile.objs | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-)
Thanks, applied to my tracing tree: https://github.com/stefanha/qemu/commits/tracing Stefan
signature.asc
Description: PGP signature
