Eduardo Habkost 9d412ac4b3 qapi: Fix error handling code on alternate conflict ... The conflict check added by commit c0644771 ("qapi: Reject alternates that can't work with keyval_parse()") doesn't work with the following declaration: { 'alternate': 'Alt', 'data': { 'one': 'bool', 'two': 'str' } } It crashes with: Traceback (most recent call last): File "./scripts/qapi-types.py", line 295, in <module> schema = QAPISchema(input_file) File "/home/ehabkost/rh/proj/virt/qemu/scripts/qapi.py", line 1468, in __init__ self.exprs = check_exprs(parser.exprs) File "/home/ehabkost/rh/proj/virt/qemu/scripts/qapi.py", line 958, in check_exprs check_alternate(expr, info) File "/home/ehabkost/rh/proj/virt/qemu/scripts/qapi.py", line 830, in check_alternate % (name, key, types_seen[qtype])) KeyError: 'QTYPE_QSTRING' This happens because the previously-seen conflicting member ('one') can't be found at types_seen[qtype], but at types_seen['QTYPE_BOOL']. Fix the bug by moving the error check to the same loop that adds new items to types_seen, raising an exception if types_seen[qt] is already set. Backports commit fda72ab4510bcc680a3c4fe55997aa29589884f7 from qemu		2018-03-07 16:57:59 -05:00
..
create_config
make_device_config.sh
ordereddict.py
qapi-event.py	Include qapi/error.h exactly where needed	2018-03-07 12:26:38 -05:00
qapi-types.py
qapi-visit.py	qapi: Remove visit_start_alternate() parameter promote_int	2018-03-03 18:34:35 -05:00
qapi.py	qapi: Fix error handling code on alternate conflict	2018-03-07 16:57:59 -05:00