[PATCH 29/59] perf tools: Change struct parse_events_state::evlist to perf_evlist

[Jiri Olsa <jolsa@redhat.com>]

Changing struct parse_events_state::evlist to perf_evlist
to prepare it for moving to libperf.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/perf/util/parse-events.c | 8 +++++---
 tools/perf/util/parse-events.h | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index f41dd97f1623..7e4bc4c1190e 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -774,6 +774,7 @@ parse_events_config_bpf(struct parse_events_state *parse_state,
 			struct list_head *head_config)
 {
 	struct parse_events_term *term;
+	struct evlist *evlist;
 	int error_pos;
 
 	if (!head_config || list_empty(head_config))
@@ -789,12 +790,13 @@ parse_events_config_bpf(struct parse_events_state *parse_state,
 			return -EINVAL;
 		}
 
-		err = bpf__config_obj(obj, term, parse_state->evlist, &error_pos);
+		evlist = container_of(parse_state->evlist, struct evlist, core);
+		err = bpf__config_obj(obj, term, evlist, &error_pos);
 		if (err) {
 			char errbuf[BUFSIZ];
 			int idx;
 
-			bpf__strerror_config_obj(obj, term, parse_state->evlist,
+			bpf__strerror_config_obj(obj, term, evlist,
 						 &error_pos, err, errbuf,
 						 sizeof(errbuf));
 
@@ -2224,7 +2226,7 @@ int __parse_events(struct evlist *evlist, const char *str,
 		.list	  = LIST_HEAD_INIT(parse_state.list),
 		.idx	  = evlist->core.nr_entries,
 		.error	  = err,
-		.evlist	  = evlist,
+		.evlist	  = &evlist->core,
 		.stoken	  = PE_START_EVENTS,
 		.fake_pmu = fake_pmu,
 		.ops	  = &parse_state_ops,
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 34ee456629b0..2f75e823124f 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -81,7 +81,7 @@ struct parse_events_state {
 	int			   idx;
 	int			   nr_groups;
 	struct parse_events_error *error;
-	struct evlist		  *evlist;
+	struct perf_evlist	  *evlist;
 	struct list_head	  *terms;
 	int			   stoken;
 	struct perf_pmu		  *fake_pmu;
-- 
2.31.1