Commit c1c7d617 authored by Ihor Solodrai's avatar Ihor Solodrai Committed by Andrii Nakryiko
Browse files

resolve_btfids: Rename object btf field to btf_path 



Rename the member of `struct object` holding the path to BTF data if
provided via --btf arg. `btf_path` is less ambiguous.

Signed-off-by: default avatarIhor Solodrai <ihor.solodrai@linux.dev>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Tested-by: default avatarAlan Maguire <alan.maguire@oracle.com>
Acked-by: default avatarEduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/bpf/20251219181321.1283664-2-ihor.solodrai@linux.dev
parent ec439c38

tools/bpf/resolve_btfids/main.c

+5 −5
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ struct btf_id { 


struct object {

	const char *path;

	const char *btf;

	const char *btf_path;

	const char *base_btf_path;



	struct {
@@ -550,11 +550,11 @@ static int symbols_resolve(struct object *obj) 
		}

	}



	btf = btf__parse_split(obj->btf ?: obj->path, base_btf);

	btf = btf__parse_split(obj->btf_path ?: obj->path, base_btf);

	err = libbpf_get_error(btf);

	if (err) {

		pr_err("FAILED: load BTF from %s: %s\n",

			obj->btf ?: obj->path, strerror(-err));

			obj->btf_path ?: obj->path, strerror(-err));

		goto out;

	}
@@ -790,8 +790,8 @@ int main(int argc, const char **argv) 
	struct option btfid_options[] = {

		OPT_INCR('v', "verbose", &verbose,

			 "be more verbose (show errors, etc)"),

		OPT_STRING(0, "btf", &obj.btf, "BTF data",

			   "BTF data"),

		OPT_STRING(0, "btf", &obj.btf_path, "file",

			   "path to a file with input BTF data"),

		OPT_STRING('b', "btf_base", &obj.base_btf_path, "file",

			   "path of file providing base BTF"),

		OPT_BOOLEAN(0, "fatal_warnings", &fatal_warnings,