[v1] Modularize generated QAPI code

[Qemu-devel] [PATCH RFC 10/21] qapi/common: Eliminate QAPISchema.exprs

Posted by Markus Armbruster 8 years ago

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 scripts/qapi/common.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index 6c6962a364..78e960d07c 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -1457,13 +1457,13 @@ class QAPISchema(object):
     def __init__(self, fname):
         try:
             parser = QAPISchemaParser(open(fname, 'r'))
-            self.exprs = check_exprs(parser.exprs)
+            exprs = check_exprs(parser.exprs)
             self.docs = parser.docs
             self._entity_dict = {}
             self._predefining = True
             self._def_predefineds()
             self._predefining = False
-            self._def_exprs()
+            self._def_exprs(exprs)
             self.check()
         except QAPIError as err:
             print >>sys.stderr, err
@@ -1648,8 +1648,8 @@ class QAPISchema(object):
                 name, info, doc, 'arg', self._make_members(data, info))
         self._def_entity(QAPISchemaEvent(name, info, doc, data, boxed))
 
-    def _def_exprs(self):
-        for expr_elem in self.exprs:
+    def _def_exprs(self, exprs):
+        for expr_elem in exprs:
             expr = expr_elem['expr']
             info = expr_elem['info']
             doc = expr_elem.get('doc')
-- 
2.13.6

Re: [Qemu-devel] [PATCH RFC 10/21] qapi/common: Eliminate QAPISchema.exprs

Posted by Eric Blake 8 years ago

On 02/02/2018 07:03 AM, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  scripts/qapi/common.py | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

Re: [Qemu-devel] [PATCH RFC 10/21] qapi/common: Eliminate QAPISchema.exprs

Posted by Marc-Andre Lureau 8 years ago

On Fri, Feb 2, 2018 at 2:03 PM, Markus Armbruster <armbru@redhat.com> wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

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


> ---
>  scripts/qapi/common.py | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
> index 6c6962a364..78e960d07c 100644
> --- a/scripts/qapi/common.py
> +++ b/scripts/qapi/common.py
> @@ -1457,13 +1457,13 @@ class QAPISchema(object):
>      def __init__(self, fname):
>          try:
>              parser = QAPISchemaParser(open(fname, 'r'))
> -            self.exprs = check_exprs(parser.exprs)
> +            exprs = check_exprs(parser.exprs)
>              self.docs = parser.docs
>              self._entity_dict = {}
>              self._predefining = True
>              self._def_predefineds()
>              self._predefining = False
> -            self._def_exprs()
> +            self._def_exprs(exprs)
>              self.check()
>          except QAPIError as err:
>              print >>sys.stderr, err
> @@ -1648,8 +1648,8 @@ class QAPISchema(object):
>                  name, info, doc, 'arg', self._make_members(data, info))
>          self._def_entity(QAPISchemaEvent(name, info, doc, data, boxed))
>
> -    def _def_exprs(self):
> -        for expr_elem in self.exprs:
> +    def _def_exprs(self, exprs):
> +        for expr_elem in exprs:
>              expr = expr_elem['expr']
>              info = expr_elem['info']
>              doc = expr_elem.get('doc')
> --
> 2.13.6
>