[Qemu-devel] [PULL for-2.0 00/11] QMP queue

[Luiz Capitulino]

The following changes since commit c57ec3249e9839c7ea2e3789f6e40f9ec1c92f55:

  Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-5' into staging 
(2014-03-11 12:52:08 +0000)

are available in the git repository at:


  git://repo.or.cz/qemu/qmp-unstable.git queue/qmp

for you to fetch changes up to 2a7a1a56d1e30de07cf7d7636a35bf7706b9500e:

  tests: test-qmp-commands: Fix double free (2014-03-11 09:07:42 -0400)

----------------------------------------------------------------
Luiz Capitulino (1):
      tests: test-qmp-commands: Fix double free

Wenchao Xia (10):
      qapi script: remember explicitly defined enum values
      qapi script: add check for duplicated key
      qapi script: remember line number in schema parsing
      qapi script: check correctness of union
      qapi script: code move for generate_enum_name()
      qapi script: use same function to generate enum string
      qapi script: support enum type as discriminator in union
      qapi: convert BlockdevOptions to use enum discriminator
      qapi script: do not allow string discriminator
      qapi script: do not add "_" for every capitalized char in enum

 docs/qapi-code-gen.txt                             |   5 +-
 include/qapi/qmp/qerror.h                          |   2 +-
 qapi-schema.json                                   |  14 +-
 scripts/qapi-types.py                              |  34 ++--
 scripts/qapi-visit.py                              |  42 +++--
 scripts/qapi.py                                    | 179 +++++++++++++++++++--
 target-i386/cpu.c                                  |   2 +-
 tests/Makefile                                     |   6 +-
 tests/qapi-schema/comments.out                     |   2 +-
 tests/qapi-schema/duplicate-key.err                |   1 +
 tests/qapi-schema/duplicate-key.exit               |   1 +
 tests/qapi-schema/duplicate-key.json               |   2 +
 tests/qapi-schema/duplicate-key.out                |   0
 .../qapi-schema/flat-union-invalid-branch-key.err  |   1 +
 .../qapi-schema/flat-union-invalid-branch-key.exit |   1 +
 .../qapi-schema/flat-union-invalid-branch-key.json |  17 ++
 .../qapi-schema/flat-union-invalid-branch-key.out  |   0
 .../flat-union-invalid-discriminator.err           |   1 +
 .../flat-union-invalid-discriminator.exit          |   1 +
 .../flat-union-invalid-discriminator.json          |  17 ++
 .../flat-union-invalid-discriminator.out           |   0
 tests/qapi-schema/flat-union-no-base.err           |   1 +
 tests/qapi-schema/flat-union-no-base.exit          |   1 +
 tests/qapi-schema/flat-union-no-base.json          |  10 ++
 tests/qapi-schema/flat-union-no-base.out           |   0
 tests/qapi-schema/flat-union-reverse-define.err    |   0
 tests/qapi-schema/flat-union-reverse-define.exit   |   1 +
 tests/qapi-schema/flat-union-reverse-define.json   |  17 ++
 tests/qapi-schema/flat-union-reverse-define.out    |   9 ++
 .../flat-union-string-discriminator.err            |   1 +
 .../flat-union-string-discriminator.exit           |   1 +
 .../flat-union-string-discriminator.json           |  17 ++
 .../flat-union-string-discriminator.out            |   0
 tests/qapi-schema/qapi-schema-test.json            |   9 +-
 tests/qapi-schema/qapi-schema-test.out             |  13 +-
 tests/qapi-schema/union-invalid-base.err           |   1 +
 tests/qapi-schema/union-invalid-base.exit          |   1 +
 tests/qapi-schema/union-invalid-base.json          |  10 ++
 tests/qapi-schema/union-invalid-base.out           |   0
 tests/test-qmp-commands.c                          |   2 +-
 tests/test-qmp-input-strict.c                      |   5 +-
 tests/test-qmp-input-visitor.c                     |  10 +-
 tests/test-qmp-output-visitor.c                    |  10 +-
 43 files changed, 379 insertions(+), 68 deletions(-)
 create mode 100644 tests/qapi-schema/duplicate-key.err
 create mode 100644 tests/qapi-schema/duplicate-key.exit
 create mode 100644 tests/qapi-schema/duplicate-key.json
 create mode 100644 tests/qapi-schema/duplicate-key.out
 create mode 100644 tests/qapi-schema/flat-union-invalid-branch-key.err
 create mode 100644 tests/qapi-schema/flat-union-invalid-branch-key.exit
 create mode 100644 tests/qapi-schema/flat-union-invalid-branch-key.json
 create mode 100644 tests/qapi-schema/flat-union-invalid-branch-key.out
 create mode 100644 tests/qapi-schema/flat-union-invalid-discriminator.err
 create mode 100644 tests/qapi-schema/flat-union-invalid-discriminator.exit
 create mode 100644 tests/qapi-schema/flat-union-invalid-discriminator.json
 create mode 100644 tests/qapi-schema/flat-union-invalid-discriminator.out
 create mode 100644 tests/qapi-schema/flat-union-no-base.err
 create mode 100644 tests/qapi-schema/flat-union-no-base.exit
 create mode 100644 tests/qapi-schema/flat-union-no-base.json
 create mode 100644 tests/qapi-schema/flat-union-no-base.out
 create mode 100644 tests/qapi-schema/flat-union-reverse-define.err
 create mode 100644 tests/qapi-schema/flat-union-reverse-define.exit
 create mode 100644 tests/qapi-schema/flat-union-reverse-define.json
 create mode 100644 tests/qapi-schema/flat-union-reverse-define.out
 create mode 100644 tests/qapi-schema/flat-union-string-discriminator.err
 create mode 100644 tests/qapi-schema/flat-union-string-discriminator.exit
 create mode 100644 tests/qapi-schema/flat-union-string-discriminator.json
 create mode 100644 tests/qapi-schema/flat-union-string-discriminator.out
 create mode 100644 tests/qapi-schema/union-invalid-base.err
 create mode 100644 tests/qapi-schema/union-invalid-base.exit
 create mode 100644 tests/qapi-schema/union-invalid-base.json
 create mode 100644 tests/qapi-schema/union-invalid-base.out