Commit 6f2b219b authored Oct 04, 2021 by Hengqi Chen Committed by Andrii Nakryiko Oct 06, 2021

selftests/bpf: Switch to new bpf_object__next_{map,program} APIs



Replace deprecated bpf_{map,program}__next APIs with newly added
bpf_object__next_{map,program} APIs, so that no compilation warnings
emit.

Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Song Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/20211003165844.4054931-3-hengqi.chen@gmail.com

parent 2088a3a7

samples/bpf/xdp1_user.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -128,7 +128,7 @@ int main(int argc, char **argv)
	if (bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd))		if (bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd))
	return 1;		return 1;

	map = bpf_map__next(NULL, obj);		map = bpf_object__next_map(obj, NULL);
	if (!map) {		if (!map) {
	printf("finding a map in obj file failed\n");		printf("finding a map in obj file failed\n");
	return 1;		return 1;

samples/bpf/xdp_sample_pkts_user.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -154,7 +154,7 @@ int main(int argc, char **argv)
	return 1;		return 1;
	}		}

	map = bpf_map__next(NULL, obj);		map = bpf_object__next_map(obj, NULL);
	if (!map) {		if (!map) {
	printf("finding a map in obj file failed\n");		printf("finding a map in obj file failed\n");
	return 1;		return 1;

tools/bpf/bpftool/iter.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -57,7 +57,7 @@ static int do_pin(int argc, char **argv)
	goto close_obj;		goto close_obj;
	}		}

	prog = bpf_program__next(NULL, obj);		prog = bpf_object__next_program(obj, NULL);
	if (!prog) {		if (!prog) {
	p_err("can't find bpf program in objfile %s", objfile);		p_err("can't find bpf program in objfile %s", objfile);
	goto close_obj;		goto close_obj;

tools/bpf/bpftool/prog.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1601,7 +1601,7 @@ static int load_with_options(int argc, char **argv, bool first_prog_only)
	goto err_close_obj;		goto err_close_obj;

	if (first_prog_only) {		if (first_prog_only) {
	prog = bpf_program__next(NULL, obj);		prog = bpf_object__next_program(obj, NULL);
	if (!prog) {		if (!prog) {
	p_err("object file doesn't contain any bpf program");		p_err("object file doesn't contain any bpf program");
	goto err_close_obj;		goto err_close_obj;

tools/testing/selftests/bpf/prog_tests/btf.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4511,7 +4511,7 @@ static void do_test_file(unsigned int test_num)
	if (CHECK(err, "obj: %d", err))		if (CHECK(err, "obj: %d", err))
	return;		return;

	prog = bpf_program__next(NULL, obj);		prog = bpf_object__next_program(obj, NULL);
	if (CHECK(!prog, "Cannot find bpf_prog")) {		if (CHECK(!prog, "Cannot find bpf_prog")) {
	err = -1;		err = -1;
	goto done;		goto done;