[Qemu-commits] [qemu/qemu] ba7957: unbreak dtrace tracing due to double _ in rdma nam...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ba795761857082a9bb8c4be1f28e7cdd82f039b0
      
https://github.com/qemu/qemu/commit/ba795761857082a9bb8c4be1f28e7cdd82f039b0
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

  Changed paths:
    M migration/rdma.c
    M trace-events

  Log Message:
  -----------
  unbreak dtrace tracing due to double _ in rdma names

It looks like the dtrace trace code gets upset if you have trace names
with __ in, which the migration/rdma.c code does.

Rename the functions and the associated traces.

Fixes: 733252deb8b7d37beacda5976c2769e18642b2fa

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reported-by: Andreas Färber <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Tested-by: Andreas Färber <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 0b7e89b103b899c21b9ab37dbf9b832db8d18108
      
https://github.com/qemu/qemu/commit/0b7e89b103b899c21b9ab37dbf9b832db8d18108
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

  Changed paths:
    M scripts/tracetool/format/d.py

  Log Message:
  -----------
  trace: add DTrace reserved words for .d files

DTrace on Mac OS X fails due to trace events using 'self' as an argument
name:

  GEN   trace/generated-tracers-dtrace.h
dtrace: failed to compile script trace/generated-tracers-dtrace.dtrace: line 
1330: syntax error, unexpected DT_KEY_SELF, expecting ) near "self"
make: *** [trace/generated-tracers-dtrace.h] Error 1

Filter argument names according to the list of DTrace .d file reserved
keywords.

Note that DTrace on Mac and Linux still do not work after this patch.
There are additional build issues remaining.

Reported-by: Henk Poley <address@hidden>
Tested-by: Henk Poley <address@hidden>
Cc: Lluís Vilanova <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: c10b02836ff02fcd09367316260f9368c5c92f28
      
https://github.com/qemu/qemu/commit/c10b02836ff02fcd09367316260f9368c5c92f28
  Author: Peter Maydell <address@hidden>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M migration/rdma.c
    M scripts/tracetool/format/d.py
    M trace-events

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

# gpg: Signature made Mon Mar  2 21:45:18 2015 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"

* remotes/stefanha/tags/tracing-pull-request:
  trace: add DTrace reserved words for .d files
  unbreak dtrace tracing due to double _ in rdma names

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


Compare: https://github.com/qemu/qemu/compare/3539bbb93e94...c10b02836ff0