|
 |
9ae3a8 |
From 51b573c7eea7a3bcaa7cd45c0b0ee39c6c912414 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <51b573c7eea7a3bcaa7cd45c0b0ee39c6c912414.1387369730.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
In-Reply-To: <091eecc4fa42754760dfff393dabcc2b444e9693.1387369730.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
References: <091eecc4fa42754760dfff393dabcc2b444e9693.1387369730.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 10 Dec 2013 15:29:18 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 18/21] qapi.py: Rename expr_eval to expr in parse_schema()
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1386689361-30281-16-git-send-email-armbru@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56132
|
|
|
9ae3a8 |
O-Subject: [PATCH 7.0 qemu-kvm 15/18] qapi.py: Rename expr_eval to expr in parse_schema()
|
|
|
9ae3a8 |
Bugzilla: 997915
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
9ae3a8 |
Message-id: 1374939721-7876-9-git-send-email-armbru@redhat.com
|
|
|
9ae3a8 |
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
9ae3a8 |
(cherry picked from commit 28b8bd4c759389bdc8430acfa588a23e4a9a7fb8)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
scripts/qapi.py | 18 +++++++++---------
|
|
|
9ae3a8 |
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
scripts/qapi.py | 18 +++++++++---------
|
|
|
9ae3a8 |
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/scripts/qapi.py b/scripts/qapi.py
|
|
|
9ae3a8 |
index 75fc282..f64b7b2 100644
|
|
|
9ae3a8 |
--- a/scripts/qapi.py
|
|
|
9ae3a8 |
+++ b/scripts/qapi.py
|
|
|
9ae3a8 |
@@ -168,15 +168,15 @@ def parse_schema(fp):
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
exprs = []
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- for expr_eval in schema.exprs:
|
|
|
9ae3a8 |
- if expr_eval.has_key('enum'):
|
|
|
9ae3a8 |
- add_enum(expr_eval['enum'])
|
|
|
9ae3a8 |
- elif expr_eval.has_key('union'):
|
|
|
9ae3a8 |
- add_union(expr_eval)
|
|
|
9ae3a8 |
- add_enum('%sKind' % expr_eval['union'])
|
|
|
9ae3a8 |
- elif expr_eval.has_key('type'):
|
|
|
9ae3a8 |
- add_struct(expr_eval)
|
|
|
9ae3a8 |
- exprs.append(expr_eval)
|
|
|
9ae3a8 |
+ for expr in schema.exprs:
|
|
|
9ae3a8 |
+ if expr.has_key('enum'):
|
|
|
9ae3a8 |
+ add_enum(expr['enum'])
|
|
|
9ae3a8 |
+ elif expr.has_key('union'):
|
|
|
9ae3a8 |
+ add_union(expr)
|
|
|
9ae3a8 |
+ add_enum('%sKind' % expr['union'])
|
|
|
9ae3a8 |
+ elif expr.has_key('type'):
|
|
|
9ae3a8 |
+ add_struct(expr)
|
|
|
9ae3a8 |
+ exprs.append(expr)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
return exprs
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.11.7
|
|
|
9ae3a8 |
|