diff options
author | Andrii Nakryiko <andrii@kernel.org> | 2022-01-19 22:05:27 -0800 |
---|---|---|
committer | Alexei Starovoitov <ast@kernel.org> | 2022-01-20 21:19:05 -0800 |
commit | ccc3f56918f670ccb5b8df2c6a15cbd083a4dd03 (patch) | |
tree | ef41b0e3950e32a62974dc7aa77c68283be3d4c2 /tools/testing/selftests/bpf/progs/test_btf_newkv.c | |
parent | selftests/bpf: fail build on compilation warning (diff) | |
download | linux-dev-ccc3f56918f670ccb5b8df2c6a15cbd083a4dd03.tar.xz linux-dev-ccc3f56918f670ccb5b8df2c6a15cbd083a4dd03.zip |
selftests/bpf: convert remaining legacy map definitions
Converted few remaining legacy BPF map definition to BTF-defined ones.
For the remaining two bpf_map_def-based legacy definitions that we want
to keep for testing purposes until libbpf 1.0 release, guard them in
pragma to suppres deprecation warnings which will be added in libbpf in
the next commit.
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20220120060529.1890907-3-andrii@kernel.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/testing/selftests/bpf/progs/test_btf_newkv.c')
-rw-r--r-- | tools/testing/selftests/bpf/progs/test_btf_newkv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/testing/selftests/bpf/progs/test_btf_newkv.c b/tools/testing/selftests/bpf/progs/test_btf_newkv.c index 1884a5bd10f5..762671a2e90c 100644 --- a/tools/testing/selftests/bpf/progs/test_btf_newkv.c +++ b/tools/testing/selftests/bpf/progs/test_btf_newkv.c @@ -9,6 +9,8 @@ struct ipv_counts { unsigned int v6; }; +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" /* just to validate we can handle maps in multiple sections */ struct bpf_map_def SEC("maps") btf_map_legacy = { .type = BPF_MAP_TYPE_ARRAY, @@ -16,6 +18,7 @@ struct bpf_map_def SEC("maps") btf_map_legacy = { .value_size = sizeof(long long), .max_entries = 4, }; +#pragma GCC diagnostic pop BPF_ANNOTATE_KV_PAIR(btf_map_legacy, int, struct ipv_counts); |