summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-04-02 09:44:35 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-04-02 09:44:35 -0500
commitaba8e41e8666e4c0287cef1f6298985d4e03211d (patch)
treef45bd6a31c5c12db334d8645bce61ab9d8b05c53
parentdfe844c9043815497b6472bfaf470b0f8d2e7312 (diff)
parent703e01e6e249e6d0a74e0cbab827b235032ec7f3 (diff)
Merge remote-tracking branch 'stefanha/tracing' into staging
* stefanha/tracing: tracetool: dtrace: handle in and next reserved words tracetool: dtrace disabled-events fix Makefile.target: code stp dependency on trace-events
-rw-r--r--Makefile.target2
-rwxr-xr-xscripts/tracetool22
2 files changed, 19 insertions, 5 deletions
diff --git a/Makefile.target b/Makefile.target
index 9b0cf74c31..cff15f0e13 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -58,7 +58,7 @@ else
TARGET_TYPE=system
endif
-$(QEMU_PROG).stp:
+$(QEMU_PROG).stp: $(SRC_PATH)/trace-events
$(call quiet-command,sh $(SRC_PATH)/scripts/tracetool \
--$(TRACE_BACKEND) \
--binary $(bindir)/$(QEMU_PROG) \
diff --git a/scripts/tracetool b/scripts/tracetool
index d675daba2b..47389b62ea 100755
--- a/scripts/tracetool
+++ b/scripts/tracetool
@@ -161,6 +161,18 @@ linetoc_nop()
return
}
+linetod_nop()
+{
+ # Used when "disabled" events are processed
+ return
+}
+
+linetostap_nop()
+{
+ # Used when "disabled" events are processed
+ return
+}
+
linetoc_end_nop()
{
return
@@ -494,10 +506,12 @@ EOF
i=1
for arg in $arglist
do
- # 'limit' is a reserved keyword
- if [ "$arg" = "limit" ]; then
- arg="_limit"
- fi
+ # postfix reserved words with '_'
+ case "$arg" in
+ limit|in|next|self)
+ arg="${arg}_"
+ ;;
+ esac
cat <<EOF
$arg = \$arg$i;
EOF