[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V5 08/10] qapi script: do not allow string discrimin
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V5 08/10] qapi script: do not allow string discriminator |
Date: |
Fri, 20 Dec 2013 13:23:14 +0800 |
Signed-off-by: Wenchao Xia <address@hidden>
---
docs/qapi-code-gen.txt | 8 +++-----
scripts/qapi-visit.py | 6 ++++++
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/docs/qapi-code-gen.txt b/docs/qapi-code-gen.txt
index a2e7921..c92add9 100644
--- a/docs/qapi-code-gen.txt
+++ b/docs/qapi-code-gen.txt
@@ -123,11 +123,9 @@ And it looks like this on the wire:
Flat union types avoid the nesting on the wire. They are used whenever a
specific field of the base type is declared as the discriminator ('type' is
-then no longer generated). The discriminator can be a string field or a
-predefined enum field. If it is a string field, a hidden enum type will be
-generated as "[UNION_NAME]Kind". If it is an enum field, a compile time check
-will be done to verify the correctness. It is recommended to use an enum field.
-The above example can then be modified as follows:
+then no longer generated). The discriminator should be a predefined enum field,
+and a compile time check will be done to verify the correctness. The above
+example can then be modified as follows:
{ 'enum': 'BlockdevDriver', 'data': [ 'raw', 'qcow2' ] }
{ 'type': 'BlockdevCommonOptions',
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index 3240921..efa7ec3 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -280,6 +280,12 @@ def generate_visit_union(expr):
# Use the predefined enum type as discriminator
ret = ""
discriminator_type_name = enum_define['enum_name']
+ elif discriminator:
+ # Do not allow string discriminator
+ sys.stderr.write("Discriminator '%s' is not a pre-defined enum "
+ "type\n" %
+ discriminator)
+ sys.exit(1)
else:
# There will always be a discriminator in the C switch code, by
default it
# is an enum type generated silently as "'%sKind' % (name)"
--
1.7.1
- [Qemu-devel] [PATCH V5 00/10] qapi script: support enum as discriminator and better enum name, Wenchao Xia, 2013/12/20
- [Qemu-devel] [PATCH V5 02/10] qapi script: add check for duplicated key, Wenchao Xia, 2013/12/20
- [Qemu-devel] [PATCH V5 01/10] qapi script: remember enum values, Wenchao Xia, 2013/12/20
- [Qemu-devel] [PATCH V5 04/10] qapi script: code move for generate_enum_name(), Wenchao Xia, 2013/12/20
- [Qemu-devel] [PATCH V5 06/10] qapi script: support pre-defined enum type as discriminator in union, Wenchao Xia, 2013/12/20
- [Qemu-devel] [PATCH V5 05/10] qapi script: use same function to generate enum string, Wenchao Xia, 2013/12/20
- [Qemu-devel] [PATCH V5 03/10] qapi script: check correctness of discriminator values in union, Wenchao Xia, 2013/12/20
- [Qemu-devel] [PATCH V5 08/10] qapi script: do not allow string discriminator,
Wenchao Xia <=
- [Qemu-devel] [PATCH V5 07/10] qapi: convert BlockdevOptions to use enum discriminator, Wenchao Xia, 2013/12/20
- [Qemu-devel] [PATCH V5 09/10] tests: add cases for inherited struct and union with discriminator, Wenchao Xia, 2013/12/20
- [Qemu-devel] [PATCH V5 10/10] qapi script: do not add "_" for every capitalized char in enum, Wenchao Xia, 2013/12/20