Commit a01a5ef9 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf kvm: Use perf_tool__init() 



Use perf_tool__init() so that more uses of 'struct perf_tool' can be const
and not relying on perf_tool__fill_defaults().

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ilkka Koskinen <ilkka@os.amperecomputing.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Jonathan Cameron <jonathan.cameron@huawei.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Nick Terrell <terrelln@fb.com>
Cc: Oliver Upton <oliver.upton@linux.dev>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <song@kernel.org>
Cc: Sun Haiyong <sunhaiyong@loongson.cn>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yanteng Si <siyanteng@loongson.cn>
Cc: Yicong Yang <yangyicong@hisilicon.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20240812204720.631678-9-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 584a268f

tools/perf/builtin-kvm.c

+6 −9
Original line number Diff line number Diff line
@@ -1603,19 +1603,17 @@ static int read_events(struct perf_kvm_stat *kvm) 
{

	int ret;



	struct perf_tool eops = {

		.sample			= process_sample_event,

		.comm			= perf_event__process_comm,

		.namespaces		= perf_event__process_namespaces,

		.ordered_events		= true,

	};

	struct perf_data file = {

		.path  = kvm->file_name,

		.mode  = PERF_DATA_MODE_READ,

		.force = kvm->force,

	};



	kvm->tool = eops;

	perf_tool__init(&kvm->tool, /*ordered_events=*/true);

	kvm->tool.sample	= process_sample_event;

	kvm->tool.comm		= perf_event__process_comm;

	kvm->tool.namespaces	= perf_event__process_namespaces;



	kvm->session = perf_session__new(&file, &kvm->tool);

	if (IS_ERR(kvm->session)) {

		pr_err("Initializing perf session failed\n");
@@ -1919,14 +1917,13 @@ static int kvm_events_live(struct perf_kvm_stat *kvm, 




	/* event handling */

	perf_tool__init(&kvm->tool, /*ordered_events=*/true);

	kvm->tool.sample = process_sample_event;

	kvm->tool.comm   = perf_event__process_comm;

	kvm->tool.exit   = perf_event__process_exit;

	kvm->tool.fork   = perf_event__process_fork;

	kvm->tool.lost   = process_lost_event;

	kvm->tool.namespaces  = perf_event__process_namespaces;

	kvm->tool.ordered_events = true;

	perf_tool__fill_defaults(&kvm->tool);



	/* set defaults */

	kvm->display_time = 1;