[Qemu-commits] [qemu/qemu] 7609ff: trace: fix tcg tracing build breakage

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 7609ffb9191e3fc473203f4bd58b934161eab358
      
https://github.com/qemu/qemu/commit/7609ffb9191e3fc473203f4bd58b934161eab358
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M docs/tracing.txt
    M scripts/tracetool/format/tcg_h.py
    M scripts/tracetool/format/tcg_helper_c.py
    M trace/Makefile.objs

  Log Message:
  -----------
  trace: fix tcg tracing build breakage

Commit 0ab8ed18a6fe98bfc82705b0f041fbf2a8ca5b60 ("trace: switch to
modular code generation for sub-directories") forgot to convert "tcg"
trace events to the modular code generation approach where each
sub-directory has its own trace-events file.

This patch fixes compilation for "tcg" trace events.  Currently they are
only used in the root ./trace-events file.

"tcg" trace events can only be used in the root ./trace-events file for
the time being.

Reported-by: Peter Maydell <address@hidden>
Tested-by: Emilio G. Cota <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Suggested-by: Emilio G. Cota <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: b8dc35b2526278296390fffa80b5c82573ed178a
      
https://github.com/qemu/qemu/commit/b8dc35b2526278296390fffa80b5c82573ed178a
  Author: Peter Maydell <address@hidden>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M docs/tracing.txt
    M scripts/tracetool/format/tcg_h.py
    M scripts/tracetool/format/tcg_helper_c.py
    M trace/Makefile.objs

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

# gpg: Signature made Tue 28 Mar 2017 15:22:59 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  trace: fix tcg tracing build breakage

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


Compare: https://github.com/qemu/qemu/compare/aba0fb1e2e8a...b8dc35b25262