[PATCH 37/59] perf tool: Pass perf_guest in struct parse_events_state

[Jiri Olsa <jolsa@redhat.com>]

Passing perf_guest in struct parse_events_state so the
parsing code does not depend on perf_guest variable.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/lib/perf/include/internal/parse-events.h |  1 +
 tools/perf/util/parse-events.c                 | 18 +++++++++++-------
 tools/perf/util/parse-events.h                 |  4 ++--
 tools/perf/util/parse-events.y                 |  8 ++++----
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/tools/lib/perf/include/internal/parse-events.h b/tools/lib/perf/include/internal/parse-events.h
index 7bf58f6fc53f..e4b136a58484 100644
--- a/tools/lib/perf/include/internal/parse-events.h
+++ b/tools/lib/perf/include/internal/parse-events.h
@@ -101,6 +101,7 @@ struct parse_events_state {
 	struct perf_pmu		  *fake_pmu;
 	char			  *hybrid_pmu_name;
 	struct parse_events_ops	  *ops;
+	bool			   guest;
 };
 
 int parse_events_term__num(struct parse_events_term **term,
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 41615c6e9871..e10f6476854f 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1618,9 +1618,9 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state,
 }
 
 int parse_events__modifier_group(struct list_head *list,
-				 char *event_mod)
+				 char *event_mod, bool guest)
 {
-	return parse_events__modifier_event(list, event_mod, true);
+	return parse_events__modifier_event(list, event_mod, true, guest);
 }
 
 /*
@@ -1770,7 +1770,7 @@ struct event_modifier {
 };
 
 static int get_event_modifier(struct event_modifier *mod, char *str,
-			       struct perf_evsel *evsel)
+			       struct perf_evsel *evsel, bool guest)
 {
 	int eu = evsel ? evsel->attr.exclude_user : 0;
 	int ek = evsel ? evsel->attr.exclude_kernel : 0;
@@ -1795,7 +1795,7 @@ static int get_event_modifier(struct event_modifier *mod, char *str,
 		if (*str == 'u') {
 			if (!exclude)
 				exclude = eu = ek = eh = 1;
-			if (!exclude_GH && !perf_guest)
+			if (!exclude_GH && !guest)
 				eG = 1;
 			eu = 0;
 		} else if (*str == 'k') {
@@ -1891,7 +1891,8 @@ static int check_modifier(char *str)
 	return 0;
 }
 
-int parse_events__modifier_event(struct list_head *list, char *str, bool add)
+int parse_events__modifier_event(struct list_head *list, char *str,
+				 bool add, bool guest)
 {
 	struct perf_evsel *evsel;
 	struct event_modifier mod;
@@ -1902,11 +1903,11 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add)
 	if (check_modifier(str))
 		return -EINVAL;
 
-	if (!add && get_event_modifier(&mod, str, NULL))
+	if (!add && get_event_modifier(&mod, str, NULL, guest))
 		return -EINVAL;
 
 	__perf_evlist__for_each_entry(list, evsel) {
-		if (add && get_event_modifier(&mod, str, evsel))
+		if (add && get_event_modifier(&mod, str, evsel, guest))
 			return -EINVAL;
 
 		evsel->attr.exclude_user   = mod.eu;
@@ -2115,6 +2116,7 @@ int parse_events_terms(struct list_head *terms, const char *str)
 		.ops     = &parse_state_ops,
 		.terms   = NULL,
 		.stoken  = PE_START_TERMS,
+		.guest   = perf_guest,
 	};
 	int ret;
 
@@ -2141,6 +2143,7 @@ static int parse_events__with_hybrid_pmu(struct parse_events_state *parse_state,
 		.hybrid_pmu_name = pmu_name,
 		.idx             = parse_state->idx,
 		.ops             = &parse_state_ops,
+		.guest           = perf_guest,
 	};
 	int ret;
 
@@ -2170,6 +2173,7 @@ int __parse_events(struct evlist *evlist, const char *str,
 		.stoken	  = PE_START_EVENTS,
 		.fake_pmu = fake_pmu,
 		.ops	  = &parse_state_ops,
+		.guest    = perf_guest,
 	};
 	int ret;
 
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index e4ac9b546bc3..599ee3a760d7 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -65,8 +65,8 @@ void parse_events__handle_error(struct parse_events_error *err, int idx,
 				char *str, char *help);
 void parse_events__shrink_config_terms(void);
 void parse_events__clear_array(struct parse_events_array *a);
-int parse_events__modifier_event(struct list_head *list, char *str, bool add);
-int parse_events__modifier_group(struct list_head *list, char *event_mod);
+int parse_events__modifier_event(struct list_head *list, char *str, bool add, bool guest);
+int parse_events__modifier_group(struct list_head *list, char *event_mod, bool guest);
 int parse_events_name(struct list_head *list, const char *name);
 int parse_events_add_tracepoint(struct parse_events_state *parse_state,
 				struct list_head *list,
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index 098e27ac718c..d5cd2827b8a0 100644
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -204,13 +204,13 @@ event
 group:
 group_def ':' PE_MODIFIER_EVENT
 {
+	struct parse_events_state *parse_state = _parse_state;
 	struct list_head *list = $1;
 	int err;
 
-	err = parse_events__modifier_group(list, $3);
+	err = parse_events__modifier_group(list, $3, parse_state->guest);
 	free($3);
 	if (err) {
-		struct parse_events_state *parse_state = _parse_state;
 		struct parse_events_error *error = parse_state->error;
 
 		parse_events__handle_error(error, @3.first_column,
@@ -261,6 +261,7 @@ event: event_mod
 event_mod:
 event_name PE_MODIFIER_EVENT
 {
+	struct parse_events_state *parse_state = _parse_state;
 	struct list_head *list = $1;
 	int err;
 
@@ -269,10 +270,9 @@ event_name PE_MODIFIER_EVENT
 	 * (there could be more events added for multiple tracepoint
 	 * definitions via '*?'.
 	 */
-	err = parse_events__modifier_event(list, $2, false);
+	err = parse_events__modifier_event(list, $2, false, parse_state->guest);
 	free($2);
 	if (err) {
-		struct parse_events_state *parse_state = _parse_state;
 		struct parse_events_error *error = parse_state->error;
 
 		parse_events__handle_error(error, @2.first_column,
-- 
2.31.1