[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 5/8] scripts/cleanup-trace-events: Fix for vcpu property
From: |
Stefan Hajnoczi |
Subject: |
[PULL v2 5/8] scripts/cleanup-trace-events: Fix for vcpu property |
Date: |
Thu, 10 Sep 2020 09:10:46 +0100 |
From: Markus Armbruster <armbru@redhat.com>
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>
---
scripts/cleanup-trace-events.pl | 10 ++++++----
1 file 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;
--
2.26.2
- [PULL v2 0/8] Tracing patches, Stefan Hajnoczi, 2020/09/10
- [PULL v2 1/8] softmmu: Add missing trace-events file, Stefan Hajnoczi, 2020/09/10
- [PULL v2 2/8] scripts/tracetool: Fix dtrace generation for macOS, Stefan Hajnoczi, 2020/09/10
- [PULL v2 3/8] scripts/tracetool: Use void pointer for vcpu, Stefan Hajnoczi, 2020/09/10
- [PULL v2 4/8] net/colo: Match is-enabled probe to tracepoint, Stefan Hajnoczi, 2020/09/10
- [PULL v2 5/8] scripts/cleanup-trace-events: Fix for vcpu property,
Stefan Hajnoczi <=
- [PULL v2 6/8] scripts/cleanup-trace-events: Emit files in alphabetical order, Stefan Hajnoczi, 2020/09/10
- [PULL v2 7/8] trace-events: Delete unused trace points, Stefan Hajnoczi, 2020/09/10
- [PULL v2 8/8] trace-events: Fix attribution of trace points to source, Stefan Hajnoczi, 2020/09/10
- Re: [PULL v2 0/8] Tracing patches, Peter Maydell, 2020/09/11