From patchwork Sun Mar 27 19:42:49 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: =?utf-8?Q?Llu=C3=ADs?= <xscript@gmx.net>
X-Patchwork-Id: 88524
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from lists.gnu.org (lists.gnu.org [199.232.76.165])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by ozlabs.org (Postfix) with ESMTPS id 778CFB6F95
	for <incoming@patchwork.ozlabs.org>;
	Mon, 28 Mar 2011 07:09:45 +1100 (EST)
Received: from localhost ([127.0.0.1]:56025 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q3vt7-00071r-DA
	for incoming@patchwork.ozlabs.org; Sun, 27 Mar 2011 15:44:37 -0400
Received: from [140.186.70.92] (port=60153 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q3vrp-0006mu-Tw
	for qemu-devel@nongnu.org; Sun, 27 Mar 2011 15:43:42 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <xscript@gmx.net>) id 1Q3vrl-0006UC-Iu
	for qemu-devel@nongnu.org; Sun, 27 Mar 2011 15:43:14 -0400
Received: from mailout-de.gmx.net ([213.165.64.23]:60444)
	by eggs.gnu.org with smtp (Exim 4.71)
	(envelope-from <xscript@gmx.net>) id 1Q3vrl-0006Tu-65
	for qemu-devel@nongnu.org; Sun, 27 Mar 2011 15:43:13 -0400
Received: (qmail invoked by alias); 27 Mar 2011 19:43:02 -0000
Received: from unknown (EHLO localhost) [84.88.53.92]
	by mail.gmx.net (mp043) with SMTP; 27 Mar 2011 21:43:02 +0200
X-Authenticated: #12333383
X-Provags-ID: V01U2FsdGVkX1/cjlIyXbDc1grbAWxma5lHUDX7wxNOwYsWloeQK0
	mEBP7w+SonnEw+
To: qemu-devel@nongnu.org
From: =?utf-8?b?TGx1w61z?= <xscript@gmx.net>
Date: Sun, 27 Mar 2011 21:42:49 +0200
Message-ID: <20110327194249.622.69985.stgit@ginnungagap.bsc.es>
User-Agent: StGit/0.15
MIME-Version: 1.0
X-Y-GMX-Trusted: 0
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 213.165.64.23
Subject: [Qemu-devel] [PATCH 1/4] trace: [ust] fix generation of 'trace.c'
	on events without args
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org

Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
---
 scripts/tracetool |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/tracetool b/scripts/tracetool
index 412f695..d88cb43 100755
--- a/scripts/tracetool
+++ b/scripts/tracetool
@@ -338,6 +338,7 @@ linetoc_ust()
     name=$(get_name "$1")
     args=$(get_args "$1")
     argnames=$(get_argnames "$1", ",")
+    [ -z "$argnames" ] || argnames=", $argnames"
     fmt=$(get_fmt "$1")
 
     cat <<EOF
@@ -345,7 +346,7 @@ DEFINE_TRACE(ust_$name);
 
 static void ust_${name}_probe($args)
 {
-    trace_mark(ust, $name, "$fmt", $argnames);
+    trace_mark(ust, $name, "$fmt"$argnames);
 }
 EOF
 
@@ -488,7 +489,7 @@ EOF
         cat <<EOF
   $arg = \$arg$i;
 EOF
-	i="$((i+1))"
+        i="$((i+1))"
     done
 
     cat <<EOF
@@ -585,7 +586,7 @@ tracetostap()
        exit 1
     fi
     if [ -z "$probeprefix" ]; then
-	probeprefix="qemu.$targettype.$targetarch";
+        probeprefix="qemu.$targettype.$targetarch";
     fi
     echo "/* This file is autogenerated by tracetool, do not edit. */"
     convert stap