summary refs log tree commit diff stats
path: root/scripts/cleanup-trace-events.pl
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2020-08-06 16:13:31 +0200
committerStefan Hajnoczi <stefanha@redhat.com>2020-09-09 17:16:57 +0100
commit164e7dd73cd8526ff0d0792de75fc646fe0c73fd (patch)
tree4f23d48389ee56c720566e6a0f862186a0ea39b3 /scripts/cleanup-trace-events.pl
parent8c8ed03850208e486f20ee2902435f1c487792e8 (diff)
downloadfocaccia-qemu-164e7dd73cd8526ff0d0792de75fc646fe0c73fd.tar.gz
focaccia-qemu-164e7dd73cd8526ff0d0792de75fc646fe0c73fd.zip
scripts/cleanup-trace-events: Fix for vcpu property
Commit a44cf524f8 "scripts/cleanup-trace-events: Update for current
practice" limited search to the input file's directory.  That's wrong
for events with the vcpu property, because these can only be defined
in root directory.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 20200806141334.3646302-2-armbru@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'scripts/cleanup-trace-events.pl')
-rwxr-xr-xscripts/cleanup-trace-events.pl10
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/cleanup-trace-events.pl b/scripts/cleanup-trace-events.pl
index d4f0e4cab5..6c3767bd6a 100755
--- a/scripts/cleanup-trace-events.pl
+++ b/scripts/cleanup-trace-events.pl
@@ -31,10 +31,12 @@ open(IN, $in) or die "open $in: $!";
 chdir($dir) or die "chdir $dir: $!";
 
 while (<IN>) {
-    if (/^(disable |(tcg) |vcpu )*([a-z_0-9]+)\(/i) {
-        my $pat = "trace_$3";
-        $pat .= '_tcg' if (defined $2);
-        open GREP, '-|', 'git', 'grep', '-lw', '--max-depth', '1', $pat
+    if (/^(disable |(tcg) |(vcpu) )*([a-z_0-9]+)\(/i) {
+        my $pat = "trace_$4";
+        $pat .= '_tcg' if defined $2;
+        open GREP, '-|', 'git', 'grep', '-lw',
+	    defined $3 ? () : ('--max-depth', '1'),
+	    $pat
             or die "run git grep: $!";
         while (my $fname = <GREP>) {
             chomp $fname;