]> git.proxmox.com Git - mirror_qemu.git/commit
qapi: Convert QType into QAPI built-in enum type
authorEric Blake <eblake@redhat.com>
Wed, 2 Dec 2015 05:20:47 +0000 (22:20 -0700)
committerMarkus Armbruster <armbru@redhat.com>
Thu, 17 Dec 2015 07:21:28 +0000 (08:21 +0100)
commit7264f5c50cc1be0f1406e3ebb45aedcca02f603a
tree2ef7be7a42b9213823acbd6826a1a1263dce3f17
parent1310a3d3bd9301ff5a825287638cfab24c2c6689
qapi: Convert QType into QAPI built-in enum type

What's more meta than using qapi to define qapi? :)

Convert QType into a full-fledged[*] builtin qapi enum type, so
that a subsequent patch can then use it as the discriminator
type of qapi alternate types.  Fortunately, the judicious use of
'prefix' in the qapi definition avoids churn to the spelling of
the enum constants.

To avoid circular definitions, we have to flip the order of
inclusion between "qobject.h" vs. "qapi-types.h".  Back in commit
28770e0, we had the latter include the former, so that we could
use 'QObject *' for our implementation of 'any'.  But that usage
also works with only a forward declaration, whereas the
definition of QObject requires QType to be a complete type.

[*] The type has to be builtin, rather than declared in
qapi/common.json, because we want to use it for alternates even
when common.json is not included. But since it is the first
builtin enum type, we have to add special cases to qapi-types
and qapi-visit to only emit definitions once, even when two
qapi files are being compiled into the same binary (the way we
already handled builtin list types like 'intList').  We may
need to revisit how multiple qapi files share common types,
but that's a project for another day.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1449033659-25497-4-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
20 files changed:
docs/qapi-code-gen.txt
include/qapi/qmp/qobject.h
include/qemu/typedefs.h
qobject/qobject.c
scripts/qapi-types.py
scripts/qapi-visit.py
scripts/qapi.py
tests/qapi-schema/alternate-empty.out
tests/qapi-schema/comments.out
tests/qapi-schema/empty.out
tests/qapi-schema/event-case.out
tests/qapi-schema/flat-union-empty.out
tests/qapi-schema/ident-with-escape.out
tests/qapi-schema/include-relpath.out
tests/qapi-schema/include-repetition.out
tests/qapi-schema/include-simple.out
tests/qapi-schema/indented-expr.out
tests/qapi-schema/qapi-schema-test.out
tests/qapi-schema/union-clash-data.out
tests/qapi-schema/union-empty.out