[Qemu-commits] [qemu/qemu] 70149d: Makefile: Keep trace-events-subdirs ordered

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 70149da7641815e08b985aa96ec15fe6ba927f12
      
https://github.com/qemu/qemu/commit/70149da7641815e08b985aa96ec15fe6ba927f12
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-01-30 (Thu, 30 Jan 2020)

  Changed paths:
    M Makefile.objs

  Log Message:
  -----------
  Makefile: Keep trace-events-subdirs ordered

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/address@hidden/msg671007.html
    Duplicate trace-events-subdirs entries generates duplicated
    symbols when using the LTTng Userspace Tracer library.

Reviewed-by: Damien Hedde <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Message-Id: <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 1aa6430dbee5237db8831f63b17b5c7c321098d0
      
https://github.com/qemu/qemu/commit/1aa6430dbee5237db8831f63b17b5c7c321098d0
  Author: Peter Maydell <address@hidden>
  Date:   2020-01-30 (Thu, 30 Jan 2020)

  Changed paths:
    M docs/devel/tracing.txt

  Log Message:
  -----------
  docs/devel/tracing.txt: Recommend only trace_event_get_state_backends()

Instead of recommending checking the TRACE_FOO_ENABLED macro to
skip expensive computations needed only for tracing, recommend
only using trace_event_get_state_backends(). This works for both
compile-time and run-time disabling of events, and has no extra
performance impact if the event is compile-time disabled.

Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Message-Id: <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 380ea843bdaf3215c6f245328b46092887c05ff0
      
https://github.com/qemu/qemu/commit/380ea843bdaf3215c6f245328b46092887c05ff0
  Author: Peter Maydell <address@hidden>
  Date:   2020-01-30 (Thu, 30 Jan 2020)

  Changed paths:
    M memory.c

  Log Message:
  -----------
  memory.c: Use trace_event_get_state_backends()

The preferred way to test whether a trace event is enabled is to
use trace_event_get_state_backends(), because this will give the
correct answer (allowing expensive computations to be skipped)
whether the trace event is compile-time or run-time disabled.
Convert the four old-style direct uses of TRACE_FOO_ENABLED in
memory.c.

Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Message-Id: <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: d4aceb2eb78a5f15e94791a43732c24b52c35dc5
      
https://github.com/qemu/qemu/commit/d4aceb2eb78a5f15e94791a43732c24b52c35dc5
  Author: Peter Maydell <address@hidden>
  Date:   2020-01-30 (Thu, 30 Jan 2020)

  Changed paths:
    M hw/display/qxl.c

  Log Message:
  -----------
  hw/display/qxl.c: Use trace_event_get_state_backends()

The preferred way to test whether a trace event is enabled is to
use trace_event_get_state_backends(), because this will give the
correct answer (allowing expensive computations to be skipped)
whether the trace event is compile-time or run-time disabled.
Convert the old-style direct use of TRACE_FOO_ENABLED.

Signed-off-by: Peter Maydell <address@hidden>
Acked-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
Message-Id: <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: e144a605a614d22165000c69e8e1dc6986d45cd8
      
https://github.com/qemu/qemu/commit/e144a605a614d22165000c69e8e1dc6986d45cd8
  Author: Salvador Fandino <address@hidden>
  Date:   2020-01-30 (Thu, 30 Jan 2020)

  Changed paths:
    M trace/control.c
    M util/log.c
    M vl.c

  Log Message:
  -----------
  qemu_set_log_filename: filename argument may be NULL

NULL is a valid log filename used to indicate we want to use stderr
but qemu_set_log_filename (which is called by bsd-user/main.c) was not
handling it correctly.

That also made redundant a couple of NULL checks in calling code which
have been removed.

Signed-off-by: Salvador Fandino <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 28db64fce555a03b4ca256d5b6f4290abdfbd9e8
      
https://github.com/qemu/qemu/commit/28db64fce555a03b4ca256d5b6f4290abdfbd9e8
  Author: Peter Maydell <address@hidden>
  Date:   2020-01-31 (Fri, 31 Jan 2020)

  Changed paths:
    M Makefile.objs
    M docs/devel/tracing.txt
    M hw/display/qxl.c
    M memory.c
    M trace/control.c
    M util/log.c
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' 
into staging

Pull request

# gpg: Signature made Thu 30 Jan 2020 21:38:06 GMT
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>" [full]
# gpg:                 aka "Stefan Hajnoczi <address@hidden>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  qemu_set_log_filename: filename argument may be NULL
  hw/display/qxl.c: Use trace_event_get_state_backends()
  memory.c: Use trace_event_get_state_backends()
  docs/devel/tracing.txt: Recommend only trace_event_get_state_backends()
  Makefile: Keep trace-events-subdirs ordered

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/aeab8e5eb220...28db64fce555