aboutsummaryrefslogtreecommitdiff
path: root/scripts/device-crash-test
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2017-07-17 15:09:26 -0300
committerMarkus Armbruster <armbru@redhat.com>2017-09-01 12:51:04 +0200
commitfda72ab4510bcc680a3c4fe55997aa29589884f7 (patch)
tree40cf0dcb520d573ee06aa48fb4ae314bd378cd5f /scripts/device-crash-test
parent223cd0e13f2e46078d7b573f0b8402bfbee339be (diff)
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. Add two additional test cases that can detect the bug. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <20170717180926.14924-1-ehabkost@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'scripts/device-crash-test')
0 files changed, 0 insertions, 0 deletions