mirror of
https://gitee.com/bianbu-linux/linux-6.6
synced 2025-04-24 14:07:52 -04:00
tools: ynl: fix enum-as-flags in the generic CLI
Lorenzo points out that the generic CLI is broken for the netdev
family. When I added the support for documentation of enums
(and sparse enums) the client script was not updated.
It expects the values in enum to be a list of names,
now it can also be a dict (YAML object).
Reported-by: Lorenzo Bianconi <lorenzo@kernel.org>
Fixes: e4b48ed460
("tools: ynl: add a completely generic client")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
6517a60b03
commit
c311aaa74c
2 changed files with 7 additions and 9 deletions
|
@ -303,11 +303,6 @@ class YnlFamily(SpecFamily):
|
|||
self.sock.setsockopt(Netlink.SOL_NETLINK, Netlink.NETLINK_CAP_ACK, 1)
|
||||
self.sock.setsockopt(Netlink.SOL_NETLINK, Netlink.NETLINK_EXT_ACK, 1)
|
||||
|
||||
self._types = dict()
|
||||
|
||||
for elem in self.yaml.get('definitions', []):
|
||||
self._types[elem['name']] = elem
|
||||
|
||||
self.async_msg_ids = set()
|
||||
self.async_msg_queue = []
|
||||
|
||||
|
@ -353,13 +348,13 @@ class YnlFamily(SpecFamily):
|
|||
|
||||
def _decode_enum(self, rsp, attr_spec):
|
||||
raw = rsp[attr_spec['name']]
|
||||
enum = self._types[attr_spec['enum']]
|
||||
enum = self.consts[attr_spec['enum']]
|
||||
i = attr_spec.get('value-start', 0)
|
||||
if 'enum-as-flags' in attr_spec and attr_spec['enum-as-flags']:
|
||||
value = set()
|
||||
while raw:
|
||||
if raw & 1:
|
||||
value.add(enum['entries'][i])
|
||||
value.add(enum.entries_by_val[i].name)
|
||||
raw >>= 1
|
||||
i += 1
|
||||
else:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue