[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/20] qapi: Simplify gen_visit_fields() error handli
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 20/20] qapi: Simplify gen_visit_fields() error handling |
Date: |
Fri, 9 Oct 2015 17:14:21 +0200 |
From: Eric Blake <address@hidden>
Since we have consolidated all generated code to use 'err' as
the name of the local variable for error detection, we can
simplify the decision on whether to skip error detection (useful
for deallocation paths) to be a boolean.
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
[Change to gen_visit_fields() simplified]
Signed-off-by: Markus Armbruster <address@hidden>
---
scripts/qapi-commands.py | 4 +---
scripts/qapi.py | 20 ++++++++++----------
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 9d214a6..43a893b 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -101,19 +101,17 @@ def gen_marshal_input_visit(arg_type, dealloc=False):
return ret
if dealloc:
- errarg = None
ret += mcgen('''
qmp_input_visitor_cleanup(qiv);
qdv = qapi_dealloc_visitor_new();
v = qapi_dealloc_get_visitor(qdv);
''')
else:
- errarg = 'err'
ret += mcgen('''
v = qmp_input_get_visitor(qiv);
''')
- ret += gen_visit_fields(arg_type.members, errarg=errarg)
+ ret += gen_visit_fields(arg_type.members, skiperr=dealloc)
if dealloc:
ret += mcgen('''
diff --git a/scripts/qapi.py b/scripts/qapi.py
index ada6380..26cff3f 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -1537,23 +1537,23 @@ def gen_params(arg_type, extra):
return ret
-def gen_err_check(err='err', label='out'):
- if not err:
+def gen_err_check(label='out', skiperr=False):
+ if skiperr:
return ''
return mcgen('''
- if (%(err)s) {
+ if (err) {
goto %(label)s;
}
''',
- err=err, label=label)
+ label=label)
-def gen_visit_fields(members, prefix='', need_cast=False, errarg='err'):
+def gen_visit_fields(members, prefix='', need_cast=False, skiperr=False):
ret = ''
- if errarg:
- errparg = '&' + errarg
- else:
+ if skiperr:
errparg = 'NULL'
+ else:
+ errparg = '&err'
for memb in members:
if memb.optional:
@@ -1562,7 +1562,7 @@ def gen_visit_fields(members, prefix='', need_cast=False,
errarg='err'):
''',
prefix=prefix, c_name=c_name(memb.name),
name=memb.name, errp=errparg)
- ret += gen_err_check(err=errarg)
+ ret += gen_err_check(skiperr=skiperr)
ret += mcgen('''
if (%(prefix)shas_%(c_name)s) {
''',
@@ -1581,7 +1581,7 @@ def gen_visit_fields(members, prefix='', need_cast=False,
errarg='err'):
c_type=memb.type.c_name(), prefix=prefix, cast=cast,
c_name=c_name(memb.name), name=memb.name,
errp=errparg)
- ret += gen_err_check(err=errarg)
+ ret += gen_err_check(skiperr=skiperr)
if memb.optional:
pop_indent()
--
2.4.3
- [Qemu-devel] [PULL 12/20] qapi: Reuse code for flat union base validation, (continued)
- [Qemu-devel] [PULL 12/20] qapi: Reuse code for flat union base validation, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 16/20] qapi: Consistent generated code: prefer common indentation, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 13/20] qapi: Consistent generated code: prefer error 'err', Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 09/20] qapi: Avoid assertion failure on union 'type' collision, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 14/20] qapi: Consistent generated code: prefer visitor 'v', Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 10/20] qapi: Add tests for empty unions, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 08/20] qapi: Test for various name collisions, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 18/20] qapi: Share gen_err_check(), Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 06/20] qapi: Invoke exception superclass initializer, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 05/20] qapi: Improve 'include' error message, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 20/20] qapi: Simplify gen_visit_fields() error handling,
Markus Armbruster <=
- [Qemu-devel] [PULL 02/20] MAINTAINERS: Specify QObject include and test files, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 03/20] MAINTAINERS: Specify QAPI include and test files, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 11/20] qapi: Test use of 'number' within alternates, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 19/20] qapi: Share gen_visit_fields(), Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 07/20] qapi: Clean up qapi.py per pep8, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL 04/20] qapi: Sort qapi-schema tests, Markus Armbruster, 2015/10/10
- [Qemu-devel] [PULL 17/20] qapi: Consistent generated code: minimize push_indent() usage, Markus Armbruster, 2015/10/10
- Re: [Qemu-devel] [PULL 00/20] QAPI patches, Peter Maydell, 2015/10/12