From 2f30651c4087d9700d37eaabe3174be04a2ad31b Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 21 Feb 2018 22:55:09 -0500 Subject: [PATCH] qapi: Use anonymous bases in QMP flat unions Now that the generator supports it, we might as well use an anonymous base rather than breaking out a single-use Base structure, for all three of our current QMP flat unions. Oddly enough, this change does not affect the resulting introspection output (because we already inline the members of a base type into an object, and had no independent use of the base type reachable from a command). The case_whitelist now has to list the name of an implicit type; which is not too bad (consider it a feature if it makes it harder for developers to make the whitelist grow :) Backports commit 3666a97f78704b941c360dc917acb14c8774eca7 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 f010c6c2..8d3eb658 100644 --- a/qemu/scripts/qapi.py +++ b/qemu/scripts/qapi.py @@ -66,7 +66,6 @@ returns_whitelist = [ case_whitelist = [ # From QMP: 'ACPISlotType', # DIMM, visible through query-acpi-ospm-status - 'CpuInfoBase', # CPU, visible through query-cpu 'CpuInfoMIPS', # PC, visible through query-cpu 'CpuInfoTricore', # PC, visible through query-cpu 'InputAxis', # TODO: drop when x-input-send-event is fixed @@ -74,6 +73,7 @@ case_whitelist = [ 'QapiErrorClass', # all members, visible through errors 'UuidInfo', # UUID, visible through query-uuid 'X86CPURegister32', # all members, visible indirectly through qom-get + 'q_obj_CpuInfo-base', # CPU, visible through query-cpu ] enum_types = []