tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

tools: ynl-get: use family c-name

If a new family is ever added with a dash in the name
the C codegen will break. Make sure we use the "safe"
form of the name consistently.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jakub Kicinski and committed by
David S. Miller 19ed9b3d 486058f4

+23 -23
+23 -23
tools/net/ynl/ynl-gen-c.py
··· 67 67 if 'nested-attributes' in attr: 68 68 self.nested_attrs = attr['nested-attributes'] 69 69 if self.nested_attrs == family.name: 70 - self.nested_render_name = f"{family.name}" 70 + self.nested_render_name = c_lower(f"{family.name}") 71 71 else: 72 - self.nested_render_name = f"{family.name}_{c_lower(self.nested_attrs)}" 72 + self.nested_render_name = c_lower(f"{family.name}_{self.nested_attrs}") 73 73 74 74 if self.nested_attrs in self.family.consts: 75 75 self.nested_struct_type = 'struct ' + self.nested_render_name + '_' ··· 335 335 336 336 maybe_enum = not self.is_bitfield and 'enum' in self.attr 337 337 if maybe_enum and self.family.consts[self.attr['enum']].enum_name: 338 - self.type_name = f"enum {self.family.name}_{c_lower(self.attr['enum'])}" 338 + self.type_name = c_lower(f"enum {self.family.name}_{self.attr['enum']}") 339 339 elif self.is_auto_scalar: 340 340 self.type_name = '__' + self.type[0] + '64' 341 341 else: ··· 685 685 686 686 self.nested = type_list is None 687 687 if family.name == c_lower(space_name): 688 - self.render_name = f"{family.name}" 688 + self.render_name = c_lower(family.name) 689 689 else: 690 - self.render_name = f"{family.name}_{c_lower(space_name)}" 690 + self.render_name = c_lower(family.name + '-' + space_name) 691 691 self.struct_name = 'struct ' + self.render_name 692 692 if self.nested and space_name in family.consts: 693 693 self.struct_name += '_' ··· 841 841 def __init__(self, family, yaml, req_value, rsp_value): 842 842 super().__init__(family, yaml, req_value, rsp_value) 843 843 844 - self.render_name = family.name + '_' + c_lower(self.name) 844 + self.render_name = c_lower(family.name + '_' + self.name) 845 845 846 846 self.dual_policy = ('do' in yaml and 'request' in yaml['do']) and \ 847 847 ('dump' in yaml and 'request' in yaml['dump']) ··· 1431 1431 suffix += '_rsp' 1432 1432 suffix += '_dump' if deref else '_list' 1433 1433 1434 - return f"{ri.family['name']}{suffix}" 1434 + return f"{ri.family.c_name}{suffix}" 1435 1435 1436 1436 1437 1437 def type_name(ri, direction, deref=False): ··· 1497 1497 1498 1498 1499 1499 def put_op_name_fwd(family, cw): 1500 - cw.write_func_prot('const char *', f'{family.name}_op_str', ['int op'], suffix=';') 1500 + cw.write_func_prot('const char *', f'{family.c_name}_op_str', ['int op'], suffix=';') 1501 1501 1502 1502 1503 1503 def put_op_name(family, cw): 1504 - map_name = f'{family.name}_op_strmap' 1504 + map_name = f'{family.c_name}_op_strmap' 1505 1505 cw.block_start(line=f"static const char * const {map_name}[] =") 1506 1506 for op_name, op in family.msgs.items(): 1507 1507 if op.rsp_value: ··· 1518 1518 cw.block_end(line=';') 1519 1519 cw.nl() 1520 1520 1521 - _put_enum_to_str_helper(cw, family.name + '_op', map_name, 'op') 1521 + _put_enum_to_str_helper(cw, family.c_name + '_op', map_name, 'op') 1522 1522 1523 1523 1524 1524 def put_enum_to_str_fwd(family, cw, enum): ··· 1840 1840 if ri.op_mode == 'dump': 1841 1841 suffix += '_dump' 1842 1842 1843 - ri.cw.block_start(line=f"struct {ri.family['name']}{suffix}") 1843 + ri.cw.block_start(line=f"struct {ri.family.c_name}{suffix}") 1844 1844 1845 1845 meta_started = False 1846 1846 for _, attr in struct.member_list(): ··· 2106 2106 cnt = len(family.ops) 2107 2107 2108 2108 qual = 'static const' if not exported else 'const' 2109 - line = f"{qual} struct {struct_type} {family.name}_nl_ops[{cnt}]" 2109 + line = f"{qual} struct {struct_type} {family.c_name}_nl_ops[{cnt}]" 2110 2110 if terminate: 2111 2111 cw.p(f"extern {line};") 2112 2112 else: ··· 2249 2249 if not family.mcgrps['list']: 2250 2250 return 2251 2251 2252 - cw.block_start('static const struct genl_multicast_group ' + family.name + '_nl_mcgrps[] =') 2252 + cw.block_start('static const struct genl_multicast_group ' + family.c_name + '_nl_mcgrps[] =') 2253 2253 for grp in family.mcgrps['list']: 2254 2254 name = grp['name'] 2255 2255 grp_id = c_upper(f"{family.name}-nlgrp-{name}") ··· 2262 2262 if not kernel_can_gen_family_struct(family): 2263 2263 return 2264 2264 2265 - cw.p(f"extern struct genl_family {family.name}_nl_family;") 2265 + cw.p(f"extern struct genl_family {family.c_name}_nl_family;") 2266 2266 cw.nl() 2267 2267 2268 2268 ··· 2277 2277 cw.p('.parallel_ops\t= true,') 2278 2278 cw.p('.module\t\t= THIS_MODULE,') 2279 2279 if family.kernel_policy == 'per-op': 2280 - cw.p(f'.ops\t\t= {family.name}_nl_ops,') 2281 - cw.p(f'.n_ops\t\t= ARRAY_SIZE({family.name}_nl_ops),') 2280 + cw.p(f'.ops\t\t= {family.c_name}_nl_ops,') 2281 + cw.p(f'.n_ops\t\t= ARRAY_SIZE({family.c_name}_nl_ops),') 2282 2282 elif family.kernel_policy == 'split': 2283 - cw.p(f'.split_ops\t= {family.name}_nl_ops,') 2284 - cw.p(f'.n_split_ops\t= ARRAY_SIZE({family.name}_nl_ops),') 2283 + cw.p(f'.split_ops\t= {family.c_name}_nl_ops,') 2284 + cw.p(f'.n_split_ops\t= ARRAY_SIZE({family.c_name}_nl_ops),') 2285 2285 if family.mcgrps['list']: 2286 - cw.p(f'.mcgrps\t\t= {family.name}_nl_mcgrps,') 2287 - cw.p(f'.n_mcgrps\t= ARRAY_SIZE({family.name}_nl_mcgrps),') 2286 + cw.p(f'.mcgrps\t\t= {family.c_name}_nl_mcgrps,') 2287 + cw.p(f'.n_mcgrps\t= ARRAY_SIZE({family.c_name}_nl_mcgrps),') 2288 2288 cw.block_end(';') 2289 2289 2290 2290 ··· 2294 2294 if obj[enum_name]: 2295 2295 start_line = 'enum ' + c_lower(obj[enum_name]) 2296 2296 elif ckey and ckey in obj: 2297 - start_line = 'enum ' + family.name + '_' + c_lower(obj[ckey]) 2297 + start_line = 'enum ' + family.c_name + '_' + c_lower(obj[ckey]) 2298 2298 cw.block_start(line=start_line) 2299 2299 2300 2300 ··· 2478 2478 cw.nl() 2479 2479 2480 2480 cw.block_start(f'{symbol} = ') 2481 - cw.p(f'.name\t\t= "{family.name}",') 2481 + cw.p(f'.name\t\t= "{family.c_name}",') 2482 2482 if family.ntfs: 2483 2483 cw.p(f".ntf_info\t= {family['name']}_ntf_info,") 2484 2484 cw.p(f".ntf_info_size\t= MNL_ARRAY_SIZE({family['name']}_ntf_info),") ··· 2560 2560 render_uapi(parsed, cw) 2561 2561 return 2562 2562 2563 - hdr_prot = f"_LINUX_{parsed.name.upper()}_GEN_H" 2563 + hdr_prot = f"_LINUX_{parsed.c_name.upper()}_GEN_H" 2564 2564 if args.header: 2565 2565 cw.p('#ifndef ' + hdr_prot) 2566 2566 cw.p('#define ' + hdr_prot)