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>
diff --git a/scripts/cleanup-trace-events.pl b/scripts/cleanup-trace-events.pl
index d4f0e4c..6c3767b 100755
--- a/scripts/cleanup-trace-events.pl
+++ b/scripts/cleanup-trace-events.pl
@@ -31,10 +31,12 @@
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;
