[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 02/13] qapi: Fix build_params() for empty paramet
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v6 02/13] qapi: Fix build_params() for empty parameter list |
Date: |
Wed, 15 Aug 2018 21:37:36 +0800 |
From: Markus Armbruster <address@hidden>
build_params() returns '' instead of 'void' when there are no
parameters. Can't happen now, but the next commit will change that.
Signed-off-by: Markus Armbruster <address@hidden>
[peterx: compose the patch from email replies]
Signed-off-by: Peter Xu <address@hidden>
---
scripts/qapi/common.py | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index 9230a2a3e8..6471c45233 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -2067,16 +2067,14 @@ extern const QEnumLookup %(c_name)s_lookup;
return ret
-def build_params(arg_type, boxed, extra):
- if not arg_type:
- assert not boxed
- return extra
+def build_params(arg_type, boxed, extra=None):
ret = ''
sep = ''
if boxed:
+ assert arg_type
ret += '%s arg' % arg_type.c_param_type()
sep = ', '
- else:
+ elif arg_type:
assert not arg_type.variants
for memb in arg_type.members:
ret += sep
@@ -2087,7 +2085,7 @@ def build_params(arg_type, boxed, extra):
c_name(memb.name))
if extra:
ret += sep + extra
- return ret
+ return ret if ret else 'void'
#
--
2.17.1
- [Qemu-devel] [PATCH v6 00/13] monitor: enable OOB by default, Peter Xu, 2018/08/15
- [Qemu-devel] [PATCH v6 01/13] monitor: simplify monitor_qmp_setup_handlers_bh, Peter Xu, 2018/08/15
- [Qemu-devel] [PATCH v6 02/13] qapi: Fix build_params() for empty parameter list,
Peter Xu <=
- [Qemu-devel] [PATCH v6 03/13] qapi: remove error checks for event emission, Peter Xu, 2018/08/15
- [Qemu-devel] [PATCH v6 04/13] monitor: move need_resume flag into monitor struct, Peter Xu, 2018/08/15
- [Qemu-devel] [PATCH v6 06/13] qapi: remove COMMAND_DROPPED event, Peter Xu, 2018/08/15
- [Qemu-devel] [PATCH v6 05/13] monitor: suspend monitor instead of send CMD_DROP, Peter Xu, 2018/08/15
- [Qemu-devel] [PATCH v6 07/13] monitor: restrict response queue length too, Peter Xu, 2018/08/15