diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-06-07 13:23:54 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-06-08 14:01:10 -0700 |
| commit | 9858bfc271de3cc61307a710044c304e6ec34f8a (patch) | |
| tree | bbf9103915428861a5a11957418771ab4878db5b /tools/net | |
| parent | 8947e503737138ff92323f99637d921451fe398a (diff) | |
tools: ynl-gen: use enum names in op strmap more carefully
In preparation for supporting families which use different msg
ids to and from the kernel - make sure the ids in op strmap
are correct. The map is expected to be used mostly for notifications,
don't generate a separate map for the "to kernel" direction.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/net')
| -rw-r--r-- | tools/net/ynl/generated/fou-user.c | 1 | ||||
| -rw-r--r-- | tools/net/ynl/lib/nlspec.py | 4 | ||||
| -rwxr-xr-x | tools/net/ynl/ynl-gen-c.py | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/tools/net/ynl/generated/fou-user.c b/tools/net/ynl/generated/fou-user.c index c99b5d438021..a0f33bb882e4 100644 --- a/tools/net/ynl/generated/fou-user.c +++ b/tools/net/ynl/generated/fou-user.c @@ -16,7 +16,6 @@ /* Enums */ static const char * const fou_op_strmap[] = { - [FOU_CMD_UNSPEC] = "unspec", [FOU_CMD_ADD] = "add", [FOU_CMD_DEL] = "del", [FOU_CMD_GET] = "get", diff --git a/tools/net/ynl/lib/nlspec.py b/tools/net/ynl/lib/nlspec.py index ada22b073aa2..bd5da8aaeac7 100644 --- a/tools/net/ynl/lib/nlspec.py +++ b/tools/net/ynl/lib/nlspec.py @@ -442,6 +442,10 @@ class SpecFamily(SpecElement): else: raise Exception("Can't parse directional ops") + if req_val == req_val_next: + req_val = None + if rsp_val == rsp_val_next: + rsp_val = None op = self.new_operation(elem, req_val, rsp_val) req_val = req_val_next rsp_val = rsp_val_next diff --git a/tools/net/ynl/ynl-gen-c.py b/tools/net/ynl/ynl-gen-c.py index c07340715601..8a0abf9048db 100755 --- a/tools/net/ynl/ynl-gen-c.py +++ b/tools/net/ynl/ynl-gen-c.py @@ -1220,7 +1220,11 @@ def put_op_name(family, cw): map_name = f'{family.name}_op_strmap' cw.block_start(line=f"static const char * const {map_name}[] =") for op_name, op in family.msgs.items(): - cw.p(f'[{op.enum_name}] = "{op_name}",') + if op.rsp_value: + if op.req_value == op.rsp_value: + cw.p(f'[{op.enum_name}] = "{op_name}",') + else: + cw.p(f'[{op.rsp_value}] = "{op_name}",') cw.block_end(line=';') cw.nl() |