diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-09-25 16:06:16 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-09-25 16:06:16 -0500 |
| commit | 3988475b9b7fa251b00a29b076761d8c1c7e64dc (patch) | |
| tree | 140c0410e1d8133ddd33e07ad2fc9c2a8d0e824b /scripts | |
| parent | 97fe81d3e8613be13754ff096c16b73010fd60ad (diff) | |
| parent | 95df51a4a02a853af8828c281bce2d4f2a41d6fd (diff) | |
| download | focaccia-qemu-3988475b9b7fa251b00a29b076761d8c1c7e64dc.tar.gz focaccia-qemu-3988475b9b7fa251b00a29b076761d8c1c7e64dc.zip | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches: w32: Always use standard instead of native format strings net/socket: Fix compiler warning (regression for MinGW) linux-user: Remove redundant null check and replace free by g_free qemu-timer: simplify qemu_run_timers TextConsole: saturate escape parameter in TTY_STATE_CSI curses: don't initialize curses when qemu is daemonized dtrace backend: add function to reserved words pflash_cfi01: Fix warning caused by unreachable code ioh3420: Remove unreachable code lm4549: Fix buffer overflow cadence_uart: Fix buffer overflow qemu-sockets: Fix potential memory leak qemu-ga: Remove unreachable code after g_error target-i386: Allow tsc-frequency to be larger then 2.147G
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/tracetool/backend/dtrace.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backend/dtrace.py index 9cab75cde8..6be7047018 100644 --- a/scripts/tracetool/backend/dtrace.py +++ b/scripts/tracetool/backend/dtrace.py @@ -87,7 +87,7 @@ def stap(events): if len(e.args) > 0: for name in e.args.names(): # Append underscore to reserved keywords - if name in ('limit', 'in', 'next', 'self'): + if name in ('limit', 'in', 'next', 'self', 'function'): name += '_' out(' %s = $arg%d;' % (name, i)) i += 1 |