From ed3da56d2685d2bf6e6a2d9e20ad6aa37a4f5446 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@redhat.com>
Date: Mon, 19 Feb 2018 15:48:10 -0500
Subject: [PATCH] qapi: Catch and reject flat union branch of array type

Backports commit f9a1427361fe06ac67480d580412dc4ed6f5d03b from qemu
---
 qemu/scripts/qapi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qemu/scripts/qapi.py b/qemu/scripts/qapi.py
index d8b29798..561e5010 100644
--- a/qemu/scripts/qapi.py
+++ b/qemu/scripts/qapi.py
@@ -579,7 +579,7 @@ def check_union(expr, expr_info):
         # Each value must name a known type; furthermore, in flat unions,
         # branches must be a struct with no overlapping member names
         check_type(expr_info, "Member '%s' of union '%s'" % (key, name),
-                   value, allow_array=True, allow_metas=allow_metas)
+                   value, allow_array=not base, allow_metas=allow_metas)
         if base:
             branch_struct = find_struct(value)
             assert branch_struct