[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/14] qapi/commands: add #if conditions to commands
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 09/14] qapi/commands: add #if conditions to commands |
Date: |
Tue, 3 Jul 2018 23:06:08 +0200 |
From: Marc-André Lureau <address@hidden>
Wrap generated code with #if/#endif using an 'ifcontext' on
QAPIGenCSnippet objects.
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[Line breaks tweaked]
Signed-off-by: Markus Armbruster <address@hidden>
---
scripts/qapi/commands.py | 24 ++++++++++++++++--------
tests/test-qmp-cmds.c | 4 ++--
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py
index dcc03c7859..0f3c991918 100644
--- a/scripts/qapi/commands.py
+++ b/scripts/qapi/commands.py
@@ -239,7 +239,7 @@ class
QAPISchemaGenCommandVisitor(QAPISchemaModularCVisitor):
QAPISchemaModularCVisitor.__init__(
self, prefix, 'qapi-commands',
' * Schema-defined QAPI/QMP commands', __doc__)
- self._regy = ''
+ self._regy = QAPIGenCCode()
self._visited_ret_types = {}
def _begin_module(self, name):
@@ -275,20 +275,28 @@ class
QAPISchemaGenCommandVisitor(QAPISchemaModularCVisitor):
void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds);
''',
c_prefix=c_name(self._prefix, protect=False)))
- genc.add(gen_registry(self._regy, self._prefix))
+ genc.add(gen_registry(self._regy.get_content(), self._prefix))
def visit_command(self, name, info, ifcond, arg_type, ret_type, gen,
success_response, boxed, allow_oob, allow_preconfig):
if not gen:
return
- self._genh.add(gen_command_decl(name, arg_type, boxed, ret_type))
+ # FIXME: If T is a user-defined type, the user is responsible
+ # for making this work, i.e. to make T's condition the
+ # conjunction of the T-returning commands' conditions. If T
+ # is a built-in type, this isn't possible: the
+ # qmp_marshal_output_T() will be generated unconditionally.
if ret_type and ret_type not in self._visited_ret_types[self._genc]:
self._visited_ret_types[self._genc].add(ret_type)
- self._genc.add(gen_marshal_output(ret_type))
- self._genh.add(gen_marshal_decl(name))
- self._genc.add(gen_marshal(name, arg_type, boxed, ret_type))
- self._regy += gen_register_command(name, success_response, allow_oob,
- allow_preconfig)
+ with ifcontext(ret_type.ifcond,
+ self._genh, self._genc, self._regy):
+ self._genc.add(gen_marshal_output(ret_type))
+ with ifcontext(ifcond, self._genh, self._genc, self._regy):
+ self._genh.add(gen_command_decl(name, arg_type, boxed, ret_type))
+ self._genh.add(gen_marshal_decl(name))
+ self._genc.add(gen_marshal(name, arg_type, boxed, ret_type))
+ self._regy.add(gen_register_command(name, success_response,
+ allow_oob, allow_preconfig))
def gen_commands(schema, output_dir, prefix):
diff --git a/tests/test-qmp-cmds.c b/tests/test-qmp-cmds.c
index 840530b84c..ce277c9c3b 100644
--- a/tests/test-qmp-cmds.c
+++ b/tests/test-qmp-cmds.c
@@ -12,12 +12,12 @@
static QmpCommandList qmp_commands;
-/* #if defined(TEST_IF_STRUCT) && defined(TEST_IF_CMD) */
+#if defined(TEST_IF_STRUCT) && defined(TEST_IF_CMD)
UserDefThree *qmp_TestIfCmd(TestIfStruct *foo, Error **errp)
{
return NULL;
}
-/* #endif */
+#endif
UserDefThree *qmp_TestCmdReturnDefThree(Error **errp)
{
--
2.17.1
- [Qemu-devel] [PULL 00/14] QAPI patches for 2018-07-03, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL 11/14] qapi-types: add #if conditions to types & visitors, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL 03/14] qapi: leave the ifcond attribute undefined until check(), Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL 09/14] qapi/commands: add #if conditions to commands,
Markus Armbruster <=
- [Qemu-devel] [PULL 04/14] qapi: add 'ifcond' to visitor methods, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL 13/14] qapi: add conditions to VNC type/commands/events on the schema, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL 06/14] qapi: add #if/#endif helpers, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL 10/14] qapi/events: add #if conditions to events, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL 14/14] qapi: add conditions to SPICE type/commands/events on the schema, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL 05/14] qapi: mcgen() shouldn't indent # lines, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL 01/14] qapi: add 'if' to top-level expressions, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL 07/14] qapi-introspect: modify to_qlit() to append ', ' on level > 0, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL 12/14] qapi: add 'If:' section to generated documentation, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PULL 02/14] qapi: pass 'if' condition into QAPISchemaEntity objects, Markus Armbruster, 2018/07/03