Commit 7ed14cbf authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2018-06-22' into staging 



QAPI patches for 2018-06-22

# gpg: Signature made Fri 22 Jun 2018 15:36:22 BST
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2018-06-22:
  MAINTAINERS: Update QAPI stanza for commit fb0bc835
  qapi/introspect: Eliminate pointless variable in .visit_end()
  Revert commit d4e5ec87
  qapi: Open files with encoding='utf-8'
  qapi: remove empty flat union branches and types
  qapi: allow empty branches in flat unions
  tests: Add QDict clone-flatten test
  qdict: Make qdict_flatten() shallow-clone-friendly
  qapi/events: generate event enum in main module
  qapi/visit: remove useless prefix argument

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5fce3122 be25fcc4

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -1625,7 +1625,8 @@ F: tests/test-*-visitor.c 
F: tests/test-qapi-*.c

F: tests/test-qmp-*.c

F: tests/test-visitor-serialization.c

F: scripts/qapi*

F: scripts/qapi-gen.py

F: scripts/qapi/*

F: docs/devel/qapi*

T: git git://repo.or.cz/qemu/armbru.git qapi-next

Makefile

+2 −4
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ ifneq ($(wildcard config-host.mak),) 
all:

include config-host.mak



PYTHON_UTF8 = LC_ALL= LANG=C LC_CTYPE=en_US.UTF-8 $(PYTHON)



git-submodule-update:



.PHONY: git-submodule-update
@@ -576,7 +574,7 @@ qga/qapi-generated/qga-qapi-commands.h qga/qapi-generated/qga-qapi-commands.c \ 
qga/qapi-generated/qga-qapi-doc.texi: \

qga/qapi-generated/qapi-gen-timestamp ;

qga/qapi-generated/qapi-gen-timestamp: $(SRC_PATH)/qga/qapi-schema.json $(qapi-py)

	$(call quiet-command,$(PYTHON_UTF8) $(SRC_PATH)/scripts/qapi-gen.py \

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-gen.py \

		-o qga/qapi-generated -p "qga-" $<, \

		"GEN","$(@:%-timestamp=%)")

	@>$@
@@ -676,7 +674,7 @@ qapi/qapi-introspect.h qapi/qapi-introspect.c \ 
qapi/qapi-doc.texi: \

qapi-gen-timestamp ;

qapi-gen-timestamp: $(qapi-modules) $(qapi-py)

	$(call quiet-command,$(PYTHON_UTF8) $(SRC_PATH)/scripts/qapi-gen.py \

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-gen.py \

		-o "qapi" -b $<, \

		"GEN","$(@:%-timestamp=%)")

	@>$@

block/qcow2.c

+0 −1
Original line number Diff line number Diff line
@@ -4166,7 +4166,6 @@ static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs) 
        switch (encrypt_info->format) {

        case Q_CRYPTO_BLOCK_FORMAT_QCOW:

            qencrypt->format = BLOCKDEV_QCOW2_ENCRYPTION_FORMAT_AES;

            qencrypt->u.aes = encrypt_info->u.qcow;

            break;

        case Q_CRYPTO_BLOCK_FORMAT_LUKS:

            qencrypt->format = BLOCKDEV_QCOW2_ENCRYPTION_FORMAT_LUKS;

cpus.c

+0 −2
Original line number Diff line number Diff line
@@ -2273,8 +2273,6 @@ CpuInfoFastList *qmp_query_cpus_fast(Error **errp) 
        info->value->target = target;

        if (target == SYS_EMU_TARGET_S390X) {

            cpustate_to_cpuinfo_s390(&info->value->u.s390x, cpu);

        } else {

            /* do nothing for @CpuInfoOther */

        }



        if (!cur_item) {

docs/devel/qapi-code-gen.txt

+5 −3
Original line number Diff line number Diff line
@@ -496,9 +496,11 @@ Resulting in these JSON objects: 


Notice that in a flat union, the discriminator name is controlled by

the user, but because it must map to a base member with enum type, the

code generator can ensure that branches exist for all values of the

enum (although the order of the keys need not match the declaration of

the enum).  In the resulting generated C data types, a flat union is

code generator ensures that branches match the existing values of the

enum. The order of the keys need not match the declaration of the enum.

The keys need not cover all possible enum values. Omitted enum values

are still valid branches that add no additional members to the data type.

In the resulting generated C data types, a flat union is

represented as a struct with the base members included directly, and

then a union of structures for each branch of the struct.