|
 |
9ae3a8 |
From 7fa89ebb4c2f761a8df462cf9ffcb6174b4a4a26 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 9 Sep 2013 14:28:14 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 23/38] qapi.py: Maintain a list of union types
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1378736903-18489-24-git-send-email-kwolf@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 54210
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH 23/32] qapi.py: Maintain a list of union types
|
|
|
9ae3a8 |
Bugzilla: 1005818
|
|
|
9ae3a8 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Bugzilla: 1005818
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit ea66c6d8819c8fc5f73a28554992be64e5399fed)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
scripts/qapi.py | 13 +++++++++++++
|
|
|
9ae3a8 |
1 file changed, 13 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
scripts/qapi.py | 13 +++++++++++++
|
|
|
9ae3a8 |
1 files changed, 13 insertions(+), 0 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/scripts/qapi.py b/scripts/qapi.py
|
|
|
9ae3a8 |
index 0c3bd84..03c42a9 100644
|
|
|
9ae3a8 |
--- a/scripts/qapi.py
|
|
|
9ae3a8 |
+++ b/scripts/qapi.py
|
|
|
9ae3a8 |
@@ -99,6 +99,7 @@ def parse_schema(fp):
|
|
|
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 |
@@ -182,6 +183,7 @@ def type_name(name):
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
enum_types = []
|
|
|
9ae3a8 |
struct_types = []
|
|
|
9ae3a8 |
+union_types = []
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
def add_struct(definition):
|
|
|
9ae3a8 |
global struct_types
|
|
|
9ae3a8 |
@@ -194,6 +196,17 @@ def find_struct(name):
|
|
|
9ae3a8 |
return struct
|
|
|
9ae3a8 |
return None
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+def add_union(definition):
|
|
|
9ae3a8 |
+ global union_types
|
|
|
9ae3a8 |
+ union_types.append(definition)
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+def find_union(name):
|
|
|
9ae3a8 |
+ global union_types
|
|
|
9ae3a8 |
+ for union in union_types:
|
|
|
9ae3a8 |
+ if union['union'] == name:
|
|
|
9ae3a8 |
+ return union
|
|
|
9ae3a8 |
+ return None
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
def add_enum(name):
|
|
|
9ae3a8 |
global enum_types
|
|
|
9ae3a8 |
enum_types.append(name)
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|