[v3] Hi, | Patchew

[Qemu-devel] [PATCH v3 30/50] qapi: add #if conditions to generated alternate variants

Posted by Marc-André Lureau 8 years, 5 months ago

Mostly covered by previous patches already.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 scripts/qapi-introspect.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/qapi-introspect.py b/scripts/qapi-introspect.py
index ef2d5577db..d6194ff702 100644
--- a/scripts/qapi-introspect.py
+++ b/scripts/qapi-introspect.py
@@ -172,7 +172,7 @@ const QLitObject %(c_name)s = %(c_string)s;
 
     def visit_alternate_type(self, name, info, ifcond, variants):
         self._gen_qlit(name, 'alternate',
-                       {'members': [{'type': self._use_type(m.type)}
+                       {'members': [({'type': self._use_type(m.type)}, m.ifcond)
                                     for m in variants.variants]}, ifcond)
 
     def visit_command(self, name, info, ifcond, arg_type, ret_type,
-- 
2.14.1.146.gd35faa819

Re: [Qemu-devel] [PATCH v3 30/50] qapi: add #if conditions to generated alternate variants

Posted by Markus Armbruster 8 years, 1 month ago

Marc-André Lureau <marcandre.lureau@redhat.com> writes:

> Mostly covered by previous patches already.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  scripts/qapi-introspect.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/qapi-introspect.py b/scripts/qapi-introspect.py
> index ef2d5577db..d6194ff702 100644
> --- a/scripts/qapi-introspect.py
> +++ b/scripts/qapi-introspect.py
> @@ -172,7 +172,7 @@ const QLitObject %(c_name)s = %(c_string)s;
>  
>      def visit_alternate_type(self, name, info, ifcond, variants):
>          self._gen_qlit(name, 'alternate',
> -                       {'members': [{'type': self._use_type(m.type)}
> +                       {'members': [({'type': self._use_type(m.type)}, m.ifcond)
>                                      for m in variants.variants]}, ifcond)
>  
>      def visit_command(self, name, info, ifcond, arg_type, ret_type,

Adds blank lines to qmp-introspect.c, just like PATCH 12, which see.