| Message ID | 20180321115211.17937-13-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | qapi: add #if pre-processor conditions to generated code | expand |
Marc-André Lureau <marcandre.lureau@redhat.com> writes: > Wrap generated code with #if/#endif using an 'ifcontext' on > QAPIGenCSnippet objects. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > scripts/qapi/events.py | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/scripts/qapi/events.py b/scripts/qapi/events.py > index 26ae00f6f7..dae03e3d88 100644 > --- a/scripts/qapi/events.py > +++ b/scripts/qapi/events.py > @@ -185,8 +185,9 @@ class QAPISchemaGenEventVisitor(QAPISchemaModularCVisitor): > genc.add(gen_enum_lookup(self._enum_name, self._event_names)) > > def visit_event(self, name, info, ifcond, arg_type, boxed): > - self._genh.add(gen_event_send_decl(name, arg_type, boxed)) > - self._genc.add(gen_event_send(name, arg_type, boxed, self._enum_name)) > + with ifcontext(ifcond, self._genh, self._genc): > + self._genh.add(gen_event_send_decl(name, arg_type, boxed)) > + self._genc.add(gen_event_send(name, arg_type, boxed, self._enum_name)) events.py:190:80: E501 line too long (82 > 79 characters) > self._event_names.append(name)
Marc-André Lureau <marcandre.lureau@redhat.com> writes: > Wrap generated code with #if/#endif using an 'ifcontext' on > QAPIGenCSnippet objects. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > scripts/qapi/events.py | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/scripts/qapi/events.py b/scripts/qapi/events.py > index 26ae00f6f7..dae03e3d88 100644 > --- a/scripts/qapi/events.py > +++ b/scripts/qapi/events.py > @@ -185,8 +185,9 @@ class QAPISchemaGenEventVisitor(QAPISchemaModularCVisitor): > genc.add(gen_enum_lookup(self._enum_name, self._event_names)) > > def visit_event(self, name, info, ifcond, arg_type, boxed): > - self._genh.add(gen_event_send_decl(name, arg_type, boxed)) > - self._genc.add(gen_event_send(name, arg_type, boxed, self._enum_name)) > + with ifcontext(ifcond, self._genh, self._genc): > + self._genh.add(gen_event_send_decl(name, arg_type, boxed)) > + self._genc.add(gen_event_send(name, arg_type, boxed, self._enum_name)) > self._event_names.append(name) This makes a conditional event's qapi_event_send_FOO() compile-time conditional, but its enum QAPIEvent member remains unconditional for now. I figure it'll get its #if in PATCH 29. Please mention this in your commit message. You do in PATCH 22.
diff --git a/scripts/qapi/events.py b/scripts/qapi/events.py index 26ae00f6f7..dae03e3d88 100644 --- a/scripts/qapi/events.py +++ b/scripts/qapi/events.py @@ -185,8 +185,9 @@ class QAPISchemaGenEventVisitor(QAPISchemaModularCVisitor): genc.add(gen_enum_lookup(self._enum_name, self._event_names)) def visit_event(self, name, info, ifcond, arg_type, boxed): - self._genh.add(gen_event_send_decl(name, arg_type, boxed)) - self._genc.add(gen_event_send(name, arg_type, boxed, self._enum_name)) + with ifcontext(ifcond, self._genh, self._genc): + self._genh.add(gen_event_send_decl(name, arg_type, boxed)) + self._genc.add(gen_event_send(name, arg_type, boxed, self._enum_name)) self._event_names.append(name)
Wrap generated code with #if/#endif using an 'ifcontext' on QAPIGenCSnippet objects. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- scripts/qapi/events.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)