[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 01/16] qapi: Assert in places where variants are
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v6 01/16] qapi: Assert in places where variants are not handled |
Date: |
Thu, 17 Mar 2016 16:48:26 -0600 |
We are getting closer to the point where we could use one union
as the base or variant type within another union type (as long
as there are no collisions between any possible combination of
member names allowed across all discriminator choices). But
until we get to that point, it is worth asserting that variants
are not present in places where we are not prepared to handle
them: when exploding a type into a parameter list, we do not
expect variants. The qapi.py code is already checking this,
via the older check_type() method; but someday we hope to get
rid of that and move checking into QAPISchema*.check(). The
two asserts added here make sure any refactoring still catches
problems, and makes it locally obvious why we can iterate over
only type.members without worrying about type.variants.
Signed-off-by: Eric Blake <address@hidden>
---
v6: no change
v5: drop redundant hunk, improve commit message
v4: new patch, split out from .is_empty() patch
---
scripts/qapi-commands.py | 3 ++-
scripts/qapi-event.py | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index f44e01f..edcbd10 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -2,7 +2,7 @@
# QAPI command marshaller generator
#
# Copyright IBM, Corp. 2011
-# Copyright (C) 2014-2015 Red Hat, Inc.
+# Copyright (C) 2014-2016 Red Hat, Inc.
#
# Authors:
# Anthony Liguori <address@hidden>
@@ -30,6 +30,7 @@ def gen_call(name, arg_type, ret_type):
argstr = ''
if arg_type:
+ assert not arg_type.variants
for memb in arg_type.members:
if memb.optional:
argstr += 'has_%s, ' % c_name(memb.name)
diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py
index fb579dd..c03cb78 100644
--- a/scripts/qapi-event.py
+++ b/scripts/qapi-event.py
@@ -59,6 +59,7 @@ def gen_event_send(name, arg_type):
name=name)
if arg_type and arg_type.members:
+ assert not arg_type.variants
ret += mcgen('''
qov = qmp_output_visitor_new();
v = qmp_output_get_visitor(qov);
--
2.5.0
- [Qemu-devel] [PATCH v6 00/16] easier unboxed visits/qapi implicit types, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 01/16] qapi: Assert in places where variants are not handled,
Eric Blake <=
- [Qemu-devel] [PATCH v6 06/16] qapi-event: Drop qmp_output_get_qobject() null check, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 02/16] qapi: Fix command with named empty argument type, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 07/16] qapi-event: Utilize implicit struct visits, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 09/16] qapi-commands: Inline single-use helpers of gen_marshal(), Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 13/16] qapi: Make BlockdevOptions doc example closer to reality, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 16/16] qapi: Consolidate object visitors, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 11/16] qapi: Drop unused c_null(), Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 04/16] qapi: Adjust names of implicit types, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 03/16] qapi: Make c_type() more OO-like, Eric Blake, 2016/03/17