[Qemu-commits] [qemu/qemu] fda72a: qapi: Fix error handling code on alternate conflic...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: fda72ab4510bcc680a3c4fe55997aa29589884f7
      
https://github.com/qemu/qemu/commit/fda72ab4510bcc680a3c4fe55997aa29589884f7
  Author: Eduardo Habkost <address@hidden>
  Date:   2017-09-01 (Fri, 01 Sep 2017)

  Changed paths:
    M scripts/qapi.py
    M tests/Makefile.include
    A tests/qapi-schema/alternate-conflict-bool-string.err
    A tests/qapi-schema/alternate-conflict-bool-string.exit
    A tests/qapi-schema/alternate-conflict-bool-string.json
    A tests/qapi-schema/alternate-conflict-bool-string.out
    A tests/qapi-schema/alternate-conflict-num-string.err
    A tests/qapi-schema/alternate-conflict-num-string.exit
    A tests/qapi-schema/alternate-conflict-num-string.json
    A tests/qapi-schema/alternate-conflict-num-string.out

  Log Message:
  -----------
  qapi: Fix error handling code on alternate conflict

The conflict check added by commit c0644771 ("qapi: Reject
alternates that can't work with keyval_parse()") doesn't work
with the following declaration:

  { 'alternate': 'Alt',
    'data': { 'one': 'bool',
        'two': 'str' } }

It crashes with:

  Traceback (most recent call last):
    File "./scripts/qapi-types.py", line 295, in <module>
      schema = QAPISchema(input_file)
    File "/home/ehabkost/rh/proj/virt/qemu/scripts/qapi.py", line 1468, in 
__init__
      self.exprs = check_exprs(parser.exprs)
    File "/home/ehabkost/rh/proj/virt/qemu/scripts/qapi.py", line 958, in 
check_exprs
      check_alternate(expr, info)
    File "/home/ehabkost/rh/proj/virt/qemu/scripts/qapi.py", line 830, in 
check_alternate
      % (name, key, types_seen[qtype]))
  KeyError: 'QTYPE_QSTRING'

This happens because the previously-seen conflicting member
('one') can't be found at types_seen[qtype], but at
types_seen['QTYPE_BOOL'].

Fix the bug by moving the error check to the same loop that adds
new items to types_seen, raising an exception if types_seen[qt]
is already set.

Add two additional test cases that can detect the bug.

Signed-off-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: e4a426e75ef35e4d8db4f0e242d67055e1cde973
      
https://github.com/qemu/qemu/commit/e4a426e75ef35e4d8db4f0e242d67055e1cde973
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M tests/qmp-test.c

  Log Message:
  -----------
  tests/qmp-test: Add generic, basic test of query commands

A command is a query if it has no side effect and yields a result.
Such commands are typically named query-FOO, but there are exceptions.

The basic idea is to find candidates with query-qmp-schema, filter out
the ones that aren't queries with an explicit blacklist, and test the
remaining ones against a QEMU with no special arguments.

The current blacklist is just add-fd.

The test can't do queries with arguments, because it knows nothing
about the arguments.  No coverage for query-cpu-model-baseline,
query-cpu-model-comparison, query-cpu-model-expansion, query-rocker,
query-rocker-ports, query-rocker-of-dpa-flows, and
query-rocker-of-dpa-groups.

Most tested commands are expected to succeed.  The test does not check
the return value then.

query-balloon and query-vm-generation-id are expected to fail because
they need a virtio-balloon / vmgenid device to succeed, and this test
is too dumb to set one up.  Could be addressed later.

query-acpi-ospm-status and query-hotpluggable-cpus are expected to
fail because they require features provided only by special machine
types, and this test is too dumb to set that up.  Could also be
addressed later.

Several commands may either be functional or stubs that always fail,
depending on build configuration.  Ideally, the stubs shouldn't be in
query-qmp-schema, but that requires QAPI schema compile-time
configuration, which we don't have, yet.  Until we do, we need to
figure out whether a command is a stub.  When we have a suitable
CONFIG_FOO preprocessor symbol is available, use that.  Else,
simply blacklist the command for now.

We get basic test coverage for the following commands, except as
noted:

    qom-list-types
    query-acpi-ospm-status      (expected to fail)
    query-balloon               (expected to fail)
    query-block
    query-block-jobs
    query-blockstats
    query-chardev
    query-chardev-backends
    query-command-line-options
    query-commands
    query-cpu-definitions       (blacklisted for now)
    query-cpus
    query-dump
    query-dump-guest-memory-capability
    query-events
    query-fdsets
    query-gic-capabilities      (blacklisted for now)
    query-hotpluggable-cpus     (expected to fail)
    query-iothreads
    query-kvm
    query-machines
    query-memdev
    query-memory-devices
    query-mice
    query-migrate
    query-migrate-cache-size
    query-migrate-capabilities
    query-migrate-parameters
    query-name
    query-named-block-nodes
    query-pci                   (blacklisted for now)
    query-qmp-schema
    query-rx-filter
    query-spice
    query-status
    query-target
    query-tpm
    query-tpm-models
    query-tpm-types
    query-uuid
    query-version
    query-vm-generation-id      (expected to fail)
    query-vnc
    query-vnc-servers
    query-xen-replication-status

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
[Typos in code under #ifndef and in the commit message fixed]


  Commit: f90cb2846a0b167d47131ba4600dcc816bccb1c6
      
https://github.com/qemu/qemu/commit/f90cb2846a0b167d47131ba4600dcc816bccb1c6
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M include/qapi/qmp/qnum.h

  Log Message:
  -----------
  qobject: Explain how QNum works, and why

Suggested-by: Max Reitz <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
[Comment typos fixed]


  Commit: 0f9afc2a8b5e78e511d79c936aa7b36deb3508bf
      
https://github.com/qemu/qemu/commit/0f9afc2a8b5e78e511d79c936aa7b36deb3508bf
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M include/qapi/qmp/qdict.h
    M scripts/coccinelle/qobject.cocci
    M target/i386/cpu.c

  Log Message:
  -----------
  qdict: Add qdict_put_null() helper, and put it to use

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
[Update to qobject.cocci squashed in, commit message tweaked]
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 28035bcdf4647245743cf87cea3788331bf67a5f
      
https://github.com/qemu/qemu/commit/28035bcdf4647245743cf87cea3788331bf67a5f
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    A include/qapi/qmp/qlit.h
    M qobject/Makefile.objs
    A qobject/qlit.c
    M tests/check-qjson.c

  Log Message:
  -----------
  qlit: move qlit from check-qjson to qobject/

Fix code style issues while at it, to please checkpatch.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 082696e767db4d2b6c8c8c233d28291b83fc2b21
      
https://github.com/qemu/qemu/commit/082696e767db4d2b6c8c8c233d28291b83fc2b21
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M include/qapi/qmp/qlit.h
    M qobject/qlit.c
    M tests/check-qjson.c

  Log Message:
  -----------
  qlit: use QLit prefix consistently

Rename from LiteralQ to QLit.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: d5cd8fbf130312bea91823c41de87d55818d599b
      
https://github.com/qemu/qemu/commit/d5cd8fbf130312bea91823c41de87d55818d599b
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M include/qapi/qmp/qlit.h

  Log Message:
  -----------
  qlit: Change compound literals to initializers

The QLIT_QFOO() macros expand into compound literals.  Sadly, gcc
doesn't recognizes these as constant expressions (clang does), which
makes the macros useless for initializing objects with static storage
duration.

There is a gcc bug about it:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71713

Change the macros to expand into initializers.

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
[Commit message improved]
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 60cc2eb7afd40b9cbaa35a5e0b54f365ac6e49f1
      
https://github.com/qemu/qemu/commit/60cc2eb7afd40b9cbaa35a5e0b54f365ac6e49f1
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M include/qapi/qmp/qlit.h
    M qobject/qlit.c
    M tests/check-qjson.c

  Log Message:
  -----------
  qlit: rename compare_litqobj_to_qobj() to qlit_equal_qobject()

compare_litqobj_to_qobj() lacks a qlit_ prefix.  Moreover, "compare"
suggests -1, 0, +1 for less than, equal and greater than.  The
function actually returns non-zero for equal, zero for unequal.
Rename to qlit_equal_qobject().

Its return type will be cleaned up in the next patch.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: d9eba57a6ad6d8fe8cf11bdd8345bbda66deb6d9
      
https://github.com/qemu/qemu/commit/d9eba57a6ad6d8fe8cf11bdd8345bbda66deb6d9
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M include/qapi/qmp/qlit.h
    M qobject/qlit.c
    M tests/check-qjson.c

  Log Message:
  -----------
  qlit: make qlit_equal_qobject return a bool

Make it more obvious about the expected return values.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: e2346a19521c6cce417250c75adb0b3a7cd5535a
      
https://github.com/qemu/qemu/commit/e2346a19521c6cce417250c75adb0b3a7cd5535a
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M include/qapi/qmp/qlit.h
    M qobject/qlit.c

  Log Message:
  -----------
  qlit: make qlit_equal_qobject() take const arguments

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 6c6084c1b0802f5265d5c7dc27f7125d9fd1cceb
      
https://github.com/qemu/qemu/commit/6c6084c1b0802f5265d5c7dc27f7125d9fd1cceb
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M include/qapi/qmp/qlit.h
    M qobject/qlit.c

  Log Message:
  -----------
  qlit: add QLIT_QNULL and QLIT_BOOL

As they are going to be used in the following patches.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 5f4bd8093671962093d9ec7d57ef65244b270dd4
      
https://github.com/qemu/qemu/commit/5f4bd8093671962093d9ec7d57ef65244b270dd4
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M qobject/qlit.c

  Log Message:
  -----------
  qlit: Replace open-coded qnum_get_int() by call

Bonus: rids us of a side effect in an assertion.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 382176b4d78e070d119af8e0dcd00884c11bbec2
      
https://github.com/qemu/qemu/commit/382176b4d78e070d119af8e0dcd00884c11bbec2
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M tests/Makefile.include
    A tests/check-qlit.c

  Log Message:
  -----------
  tests/check-qlit: New, covering qobject/qlit.c

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
[Copyright notice correction squashed in, commit message tweaked]
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 6da8a7a3b444211914418d2b3c7dc615d70a7d2d
      
https://github.com/qemu/qemu/commit/6da8a7a3b444211914418d2b3c7dc615d70a7d2d
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M qobject/qlit.c
    M tests/check-qlit.c

  Log Message:
  -----------
  qlit: Tighten QLit dict vs QDict comparison

We check that all members of the QLit dictionary are also in the
QDict.  We neglect to check the other direction.

Comparing the number of members suffices, because QDict can't
contain duplicate members, and putting duplicates in a QLit is a
programming error.

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
[Commit message improved]
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: cbb654052600c376d5ee3401c98a25d09d11a154
      
https://github.com/qemu/qemu/commit/cbb654052600c376d5ee3401c98a25d09d11a154
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M qobject/qlit.c
    M tests/check-qlit.c

  Log Message:
  -----------
  qlit: Tighten QLit list vs QList comparison

We check that all members of the QLit list are also in the QList.  We
neglect to check the other direction.  Fix that.

While there, use QLIST_FOREACH_ENTRY() to simplify the code and break
the loop on the first mismatch.

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
[Commit message improved]
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 211e5063be7ffc34ed1daaa4a1aa5f5cfb039995
      
https://github.com/qemu/qemu/commit/211e5063be7ffc34ed1daaa4a1aa5f5cfb039995
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M qapi-schema.json

  Log Message:
  -----------
  qapi-schema: Document how generated documentation is ordered

Documentation generated with qapi2texi.py is in source order, with
included sub-schemas inserted at the first include directive
(subsequent include directives have no effect).  To get a sane and
stable order, it's best to include each sub-schema just once, or
include it first in qapi-schema.json.  Document that.

While there, drop a few redundant comments.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>


  Commit: a885cd391549ea11ca78ad1e5ac6b14bc1452cac
      
https://github.com/qemu/qemu/commit/a885cd391549ea11ca78ad1e5ac6b14bc1452cac
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M qapi/introspect.json

  Log Message:
  -----------
  qapi-schema: Introspection doc is in the wrong section, fix

Bug: introspection documentation is in section "Tracing commands".

Cause: sub-schema qapi/introspect.json lacks a section header, and
therefore goes into whatever section precedes its include.

Fix: add a section header.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>


  Commit: c7a4e0c40d29ba889b7ebcf4ec97c58be421123b
      
https://github.com/qemu/qemu/commit/c7a4e0c40d29ba889b7ebcf4ec97c58be421123b
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M qapi-schema.json

  Log Message:
  -----------
  qapi-schema: Rocker doc section contains unrelated stuff, fix

Bug: section "Rocker switch device" starts with the rocker stuff, but
then has unrelated stuff, like ReplayMode, xen-load-devices-state, ...

Cause: rocker.json is included in the middle of section "QMP commands".

Fix: include it in a sane place, namely next to the other sub-schemas.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>


  Commit: a2ff5a48c4623be422f6271dd95ce047af0df3ec
      
https://github.com/qemu/qemu/commit/a2ff5a48c4623be422f6271dd95ce047af0df3ec
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M MAINTAINERS
    M Makefile
    M qapi-schema.json
    M qapi/block-core.json
    M qapi/common.json
    A qapi/sockets.json

  Log Message:
  -----------
  qapi-schema: Collect sockets stuff in qapi/sockets.json

Cc: "Daniel P. Berrange" <address@hidden>
Cc: Gerd Hoffmann <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: 0e201d3402ec612bb7ae66dac2deac59c5015924
      
https://github.com/qemu/qemu/commit/0e201d3402ec612bb7ae66dac2deac59c5015924
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M MAINTAINERS
    M Makefile
    M qapi-schema.json
    M qapi/event.json
    A qapi/run-state.json

  Log Message:
  -----------
  qapi-schema: Collect run state stuff in qapi/run-state.json

Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: dbeee39233114c052deaa8861590cc4a4e836461
      
https://github.com/qemu/qemu/commit/dbeee39233114c052deaa8861590cc4a4e836461
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M MAINTAINERS
    M Makefile
    M qapi-schema.json
    A qapi/char.json
    M qapi/event.json

  Log Message:
  -----------
  qapi-schema: Collect char device stuff in qapi/char.json

Cc: Paolo Bonzini <address@hidden>
Cc: Marc-André Lureau <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: 3c0bd37dac270b52159057065cdefe2496dc0e89
      
https://github.com/qemu/qemu/commit/3c0bd37dac270b52159057065cdefe2496dc0e89
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M MAINTAINERS
    M Makefile
    M qapi-schema.json
    M qapi/event.json
    A qapi/net.json

  Log Message:
  -----------
  qapi-schema: Collect net device stuff in qapi/net.json

Cc: Jason Wang <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: 608cfed66a6adeac136b0c09cd62d081062256f3
      
https://github.com/qemu/qemu/commit/608cfed66a6adeac136b0c09cd62d081062256f3
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M MAINTAINERS
    M Makefile
    M qapi-schema.json
    M qapi/event.json
    A qapi/ui.json

  Log Message:
  -----------
  qapi-schema: Collect UI stuff in qapi/ui.json

UI stuff is remote desktop stuff (Spice, VNC) and input stuff (mouse,
keyboard).

Cc: Gerd Hoffmann <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>


  Commit: 48685a8e2c49f082a43cb48e9ca62894f3cc11bf
      
https://github.com/qemu/qemu/commit/48685a8e2c49f082a43cb48e9ca62894f3cc11bf
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M MAINTAINERS
    M Makefile
    M qapi-schema.json
    M qapi/common.json
    M qapi/event.json
    A qapi/migration.json

  Log Message:
  -----------
  qapi-schema: Collect migration stuff in qapi/migration.json

Cc: Juan Quintela <address@hidden>
Cc: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>


  Commit: fa988e39bfdb2401cf77f44d45cf46a425c52d03
      
https://github.com/qemu/qemu/commit/fa988e39bfdb2401cf77f44d45cf46a425c52d03
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M MAINTAINERS
    M Makefile
    M qapi-schema.json
    A qapi/transaction.json

  Log Message:
  -----------
  qapi-schema: Collect transaction stuff in qapi/transaction.json

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: 3859b6cf670f3eff97d36e1f247cbcd0811e8351
      
https://github.com/qemu/qemu/commit/3859b6cf670f3eff97d36e1f247cbcd0811e8351
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M MAINTAINERS
    M Makefile
    M qapi-schema.json
    A qapi/tpm.json

  Log Message:
  -----------
  qapi-schema: Collect TPM stuff in qapi/tpm.json

Sadly, we don't have a TPM maintainer, not even a MAINTAINERS entry.
Create one, and mark it orphaned.

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: fd87a6bd3b78cc51be5be2cf1bccffd010a3f4cb
      
https://github.com/qemu/qemu/commit/fd87a6bd3b78cc51be5be2cf1bccffd010a3f4cb
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M qapi/block.json
    M qapi/event.json

  Log Message:
  -----------
  qapi-schema: Move block events from event.json to block.json

Cc: Alberto Garcia <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: c09656f1d39203d2a3e12286acbd35f4fad450b2
      
https://github.com/qemu/qemu/commit/c09656f1d39203d2a3e12286acbd35f4fad450b2
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M Makefile
    M qapi-schema.json
    R qapi/event.json

  Log Message:
  -----------
  qapi-schema: Fold event.json back into qapi-schema.json

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: 2031c133ed5197c9c6eaf6755dcc439e8dbc0385
      
https://github.com/qemu/qemu/commit/2031c133ed5197c9c6eaf6755dcc439e8dbc0385
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M qapi-schema.json
    M qapi/block-core.json
    M qapi/common.json

  Log Message:
  -----------
  qapi-schema: Make block-core.json self-contained

Except for block-core.json, the sub-schemas are self-contained: if
they use a symbol defined in another sub-schema, they include that
sub-schema.  To check, feed the sub-schema to qapi2texi (or any other
QAPI generator) along with the pragma from qapi-schema.json.

Fix up things to make block-core.json self-contained, too.

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: 496490a604c5c34c1d015558dda13ae052d7eb32
      
https://github.com/qemu/qemu/commit/496490a604c5c34c1d015558dda13ae052d7eb32
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M qapi-schema.json
    M qapi/common.json

  Log Message:
  -----------
  qapi-schema: Move queries from common.json to qapi-schema.json

query-version and query-commands are in common.json for no good
reason.  Several similar queries are in qapi-schema.json.  Move them
there.

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: f5cf31c5758b9ab8b77f4d6ccd3ffe43036c5480
      
https://github.com/qemu/qemu/commit/f5cf31c5758b9ab8b77f4d6ccd3ffe43036c5480
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M qapi-schema.json
    M qapi/block-core.json
    M qapi/block.json
    M qapi/common.json
    M qapi/crypto.json
    M qapi/trace.json

  Log Message:
  -----------
  qapi-schema: Improve section headings

The generated QEMU QMP reference is now structured as follows:

    1.1 Introduction
    1.2 Stability Considerations
    1.3 Common data types
    1.4 Socket data types
    1.5 VM run state
    1.6 Cryptography
    1.7 Block devices
    1.7.1 Block core (VM unrelated)
    1.7.2 QAPI block definitions (vm unrelated)
    1.8 Character devices
    1.9 Net devices
    1.10 Rocker switch device
    1.11 TPM (trusted platform module) devices
    1.12 Remote desktop
    1.12.1 Spice
    1.12.2 VNC
    1.13 Input
    1.14 Migration
    1.15 Transactions
    1.16 Tracing
    1.17 QMP introspection
    1.18 Miscellanea

Section "1.18 Miscellanea" is still too big: it documents 134 symbols.
Section "1.7.1 Block core (VM unrelated)" is also rather big: 128
symbols.  All the others are of reasonable size.

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: 64355088e0213b564eb6ef5d2658210accfcc32f
      
https://github.com/qemu/qemu/commit/64355088e0213b564eb6ef5d2658210accfcc32f
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M docs/devel/qapi-code-gen.txt

  Log Message:
  -----------
  qapi: Update qapi-code-gen.txt examples to match current code

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: 06c60b6c468ca7cde004fe7c3ce35de312855f55
      
https://github.com/qemu/qemu/commit/06c60b6c468ca7cde004fe7c3ce35de312855f55
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M block.c
    M block/file-posix.c
    M block/file-win32.c
    M block/gluster.c
    M block/parallels.c
    M block/qcow2.c
    M blockdev.c
    M hmp.c
    M include/qapi/util.h
    M migration/global_state.c
    M qapi/qapi-util.c
    M qemu-img.c
    M qemu-nbd.c
    M tests/qmp-test.c
    M tests/test-qapi-util.c

  Log Message:
  -----------
  qapi: Drop superfluous qapi_enum_parse() parameter max

The lookup tables have a sentinel, no need to make callers pass their
size.

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
[Rebased, commit message corrected]


  Commit: a9a72aeefbd3ef8bcbbeeccaf174ee10db2978ac
      
https://github.com/qemu/qemu/commit/a9a72aeefbd3ef8bcbbeeccaf174ee10db2978ac
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M include/sysemu/tpm_backend.h
    M tpm.c

  Log Message:
  -----------
  tpm: Clean up driver registration & lookup

We have a strict separation between enum TpmType and be_drivers[]:

* TpmType may have any number of members.  It just happens to have one.

* tpm_register_driver() uses the first empty slot in be_drivers[].

  If you register more than tpm_models[] has space,
  tpm_register_driver() fails.  Its caller silently ignores the
  failure.

  If you register more than one with a given TpmType,
  tpm_display_backend_drivers() will shows all of them, but
  tpm_driver_find_by_type() and tpm_get_backend_driver() will find
  only the one one that registered first.

Since we only ever register one driver, and be_drivers[] has space for
just that one, this contraption even works.

Turn be_drivers[] into a straight map from enum TpmType to driver.
Much simpler, and has a decent chance to actually work should we ever
acquire additional drivers.

While there, use qapi_enum_parse() in tpm_get_backend_driver().

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[Rebased, superfluous initializer dropped, commit message rewritten]
Cc: Stefan Berger <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>


  Commit: 00bbf50a50e6d6e1a4542db1c1205291395c4105
      
https://github.com/qemu/qemu/commit/00bbf50a50e6d6e1a4542db1c1205291395c4105
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M include/sysemu/tpm_backend.h
    M tpm.c

  Log Message:
  -----------
  tpm: Clean up model registration & lookup

We have a strict separation between enum TpmModel and tpm_models[]:

* TpmModel may have any number of members.  It just happens to have one.

* tpm_register_model() uses the first empty slot in tpm_models[].

  If you register more than tpm_models[] has space,
  tpn_register_model() fails.  Its caller silently ignores the
  failure.

  Register the same TpmModel more than once has no effect other than
  wasting tpm_models[] slots: tpm_model_is_registered() is happy with
  the first one it finds.

Since we only ever register one model, and tpm_models[] has space for
just that one, this contraption even works.

Turn tpm_models[] into a straight map from enum TpmType to bool.  Much
simpler.

Cc: Stefan Berger <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
[Commit message typo fixed]


  Commit: 8e615e34f9f5dc0ee3a39a468ec96ea537c4afe9
      
https://github.com/qemu/qemu/commit/8e615e34f9f5dc0ee3a39a468ec96ea537c4afe9
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M hmp.c

  Log Message:
  -----------
  hmp: Use qapi_enum_parse() in hmp_migrate_set_capability()

The error message on invalid capability name changes from

    Invalid parameter "NAME"

to

    invalid parameter value: NAME

No worse than before.

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[Rebased, commit message rewritten]
Cc: "Dr. David Alan Gilbert" <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>


  Commit: 262517b7e062bde92beb9304fb813cac1e95643a
      
https://github.com/qemu/qemu/commit/262517b7e062bde92beb9304fb813cac1e95643a
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M hmp.c

  Log Message:
  -----------
  hmp: Use qapi_enum_parse() in hmp_migrate_set_parameter()

The error message on invalid parameter name changes from

    Invalid parameter "NAME"

to

    invalid parameter value: NAME

Slight degratation, perhaps.

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[Rebased, assertion added, commit message rewritten]
Cc: "Dr. David Alan Gilbert" <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>


  Commit: f9509d151710caff22af97d904bad6aa7ff584bf
      
https://github.com/qemu/qemu/commit/f9509d151710caff22af97d904bad6aa7ff584bf
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M block/blkdebug.c

  Log Message:
  -----------
  block: Use qemu_enum_parse() in blkdebug_debug_breakpoint()

The error message on invalid blkdebug events changes from

    qemu-system-x86_64: LOCATION: Invalid event name "VALUE"

to

    qemu-system-x86_64: LOCATION: invalid parameter value: VALUE

Slight degradation, but the message is sub-par even before the patch.
When complaining about a parameter value, both parameter name and
value should be mentioned, as the value may well not be unique.  Left
for another day.

Also left is the error message's unhelpful location: it points to the
config=FILENAME rather than into that file.

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[Rebased, commit message rewritten]
Cc: Kevin Wolf <address@hidden>
Cc: Max Reitz <address@hidden>
Cc: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>


  Commit: 8d5fb199fb20446f8233226124b9f13be1434efc
      
https://github.com/qemu/qemu/commit/8d5fb199fb20446f8233226124b9f13be1434efc
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M block/quorum.c

  Log Message:
  -----------
  quorum: Use qapi_enum_parse() in quorum_open()

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[Rebased, qemu_opt_get() factored out, commit message tweaked]
Cc: Alberto Garcia <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>


  Commit: 9ae33079c2061d73c88dbe2dd79373dedc50f693
      
https://github.com/qemu/qemu/commit/9ae33079c2061d73c88dbe2dd79373dedc50f693
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M crypto/block-luks.c

  Log Message:
  -----------
  crypto: Use qapi_enum_parse() in qcrypto_block_luks_name_lookup()

Cc: "Daniel P. Berrange" <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Acked-by: Daniel P. Berrange <address@hidden>


  Commit: 113e47ae6dc45b08e732dd5fa85abe71b764f5ae
      
https://github.com/qemu/qemu/commit/113e47ae6dc45b08e732dd5fa85abe71b764f5ae
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M qapi/qapi-visit-core.c

  Log Message:
  -----------
  qapi: Use qapi_enum_parse() in input_type_enum()

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: 1c236ba5319d6141964fddb38f1d942cebcaed05
      
https://github.com/qemu/qemu/commit/1c236ba5319d6141964fddb38f1d942cebcaed05
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M monitor.c
    M tests/test-qobject-input-visitor.c
    M tests/test-string-input-visitor.c
    M ui/input-legacy.c

  Log Message:
  -----------
  qapi: Avoid unnecessary use of enum lookup table's sentinel

Currently, the FOO_lookup[] generated for QAPI enum types are
terminated by a NULL sentinel.

A future patch will generate enums with "holes".  NULL-termination
will cease to work then.

To prepare for that, replace "have we reached the sentinel?"
predicates by "have we reached the FOO__MAX value?" predicates.

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: 5b5f825d44306b18509cd10ba9ac6983e90d6e0f
      
https://github.com/qemu/qemu/commit/5b5f825d44306b18509cd10ba9ac6983e90d6e0f
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M block.c
    M block/blkdebug.c
    M block/file-posix.c
    M block/file-win32.c
    M block/gluster.c
    M block/parallels.c
    M block/qcow2.c
    M block/quorum.c
    M blockdev.c
    M crypto/block-luks.c
    M docs/devel/qapi-code-gen.txt
    M hmp.c
    M include/qapi/util.h
    M migration/global_state.c
    M migration/migration.c
    M qapi/qapi-util.c
    M qapi/qapi-visit-core.c
    M qemu-img.c
    M qemu-nbd.c
    M scripts/qapi-event.py
    M scripts/qapi-types.py
    M scripts/qapi.py
    M tests/test-qapi-util.c
    M tpm.c
    M util/keyval.c

  Log Message:
  -----------
  qapi: Generate FOO_str() macro for QAPI enum FOO

The next commit will put it to use.  May look pointless now, but we're
going to change the FOO_lookup's type, and then it'll help.

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: 977c736f80c232de7c6476d793ed575359c049d8
      
https://github.com/qemu/qemu/commit/977c736f80c232de7c6476d793ed575359c049d8
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M backends/hostmem.c
    M block/backup.c
    M block/file-posix.c
    M block/file-win32.c
    M block/gluster.c
    M block/iscsi.c
    M block/nfs.c
    M block/qcow2.c
    M block/qed.c
    M block/rbd.c
    M block/sheepdog.c
    M blockdev.c
    M blockjob.c
    M chardev/char.c
    M crypto/block-luks.c
    M crypto/block.c
    M crypto/cipher-afalg.c
    M crypto/cipher-builtin.c
    M crypto/cipher-gcrypt.c
    M crypto/cipher-nettle.c
    M crypto/hmac-gcrypt.c
    M crypto/hmac-glib.c
    M crypto/hmac-nettle.c
    M crypto/pbkdf-gcrypt.c
    M crypto/pbkdf-nettle.c
    M hmp.c
    M hw/block/fdc.c
    M hw/char/escc.c
    M hw/input/virtio-input-hid.c
    M migration/colo-failover.c
    M migration/colo.c
    M migration/global_state.c
    M monitor.c
    M net/net.c
    M qapi/qmp-dispatch.c
    M tests/test-qapi-util.c
    M tests/test-qobject-input-visitor.c
    M tests/test-qobject-output-visitor.c
    M tests/test-string-input-visitor.c
    M tests/test-string-output-visitor.c
    M tpm.c
    M ui/input-legacy.c
    M ui/input.c
    M ui/vnc.c
    M vl.c

  Log Message:
  -----------
  qapi: Mechanically convert FOO_lookup[...] to FOO_str(...)

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: 788b305c91398f18e5952667b929d7f45e2c211c
      
https://github.com/qemu/qemu/commit/788b305c91398f18e5952667b929d7f45e2c211c
  Author: Markus Armbruster <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M hw/core/qdev-properties.c
    M qapi/qapi-visit-core.c

  Log Message:
  -----------
  qapi: Convert indirect uses of FOO_lookup[...] to qapi_enum_lookup()

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: f7abe0ecd4973dfe36944b916c5b9cf8ec199b8a
      
https://github.com/qemu/qemu/commit/f7abe0ecd4973dfe36944b916c5b9cf8ec199b8a
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M backends/hostmem.c
    M block.c
    M block/blkdebug.c
    M block/file-posix.c
    M block/file-win32.c
    M block/gluster.c
    M block/parallels.c
    M block/qcow2.c
    M block/quorum.c
    M blockdev.c
    M crypto/block-luks.c
    M crypto/secret.c
    M crypto/tlscreds.c
    M hmp.c
    M hw/core/qdev-properties.c
    M include/hw/qdev-core.h
    M include/qapi/util.h
    M include/qapi/visitor.h
    M include/qom/object.h
    M migration/global_state.c
    M net/filter.c
    M qapi/qapi-util.c
    M qapi/qapi-visit-core.c
    M qemu-img.c
    M qemu-nbd.c
    M qom/object.c
    M scripts/qapi-visit.py
    M scripts/qapi.py
    M tests/check-qom-proplist.c
    M tests/qmp-test.c
    M tests/test-qapi-util.c
    M tests/test-qobject-input-visitor.c
    M tpm.c

  Log Message:
  -----------
  qapi: Change data type of the FOO_lookup generated for enum FOO

Currently, a FOO_lookup is an array of strings terminated by a NULL
sentinel.

A future patch will generate enums with "holes".  NULL-termination
will cease to work then.

To prepare for that, store the length in the FOO_lookup by wrapping it
in a struct and adding a member for the length.

The sentinel will be dropped next.

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
[Basically redone]
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
[Rebased]


  Commit: ebf677c8497ee81537f7ce57b165c978511ccde5
      
https://github.com/qemu/qemu/commit/ebf677c8497ee81537f7ce57b165c978511ccde5
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M block/parallels.c
    M scripts/qapi.py
    M tests/check-qom-proplist.c

  Log Message:
  -----------
  qapi: drop the sentinel in enum array

Now that all usages have been converted to user lookup helpers.

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
[Rebased, superfluous local variable dropped, missing
check-qom-proplist.c update added]
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>


  Commit: 98bfaac788be0ca63d7d010c8d4ba100ff1d8278
      
https://github.com/qemu/qemu/commit/98bfaac788be0ca63d7d010c8d4ba100ff1d8278
  Author: Peter Maydell <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M MAINTAINERS
    M Makefile
    M backends/hostmem.c
    M block.c
    M block/backup.c
    M block/blkdebug.c
    M block/file-posix.c
    M block/file-win32.c
    M block/gluster.c
    M block/iscsi.c
    M block/nfs.c
    M block/parallels.c
    M block/qcow2.c
    M block/qed.c
    M block/quorum.c
    M block/rbd.c
    M block/sheepdog.c
    M blockdev.c
    M blockjob.c
    M chardev/char.c
    M crypto/block-luks.c
    M crypto/block.c
    M crypto/cipher-afalg.c
    M crypto/cipher-builtin.c
    M crypto/cipher-gcrypt.c
    M crypto/cipher-nettle.c
    M crypto/hmac-gcrypt.c
    M crypto/hmac-glib.c
    M crypto/hmac-nettle.c
    M crypto/pbkdf-gcrypt.c
    M crypto/pbkdf-nettle.c
    M crypto/secret.c
    M crypto/tlscreds.c
    M docs/devel/qapi-code-gen.txt
    M hmp.c
    M hw/block/fdc.c
    M hw/char/escc.c
    M hw/core/qdev-properties.c
    M hw/input/virtio-input-hid.c
    M include/hw/qdev-core.h
    M include/qapi/qmp/qdict.h
    A include/qapi/qmp/qlit.h
    M include/qapi/qmp/qnum.h
    M include/qapi/util.h
    M include/qapi/visitor.h
    M include/qom/object.h
    M include/sysemu/tpm_backend.h
    M migration/colo-failover.c
    M migration/colo.c
    M migration/global_state.c
    M migration/migration.c
    M monitor.c
    M net/filter.c
    M net/net.c
    M qapi-schema.json
    M qapi/block-core.json
    M qapi/block.json
    A qapi/char.json
    M qapi/common.json
    M qapi/crypto.json
    R qapi/event.json
    M qapi/introspect.json
    A qapi/migration.json
    A qapi/net.json
    M qapi/qapi-util.c
    M qapi/qapi-visit-core.c
    M qapi/qmp-dispatch.c
    A qapi/run-state.json
    A qapi/sockets.json
    A qapi/tpm.json
    M qapi/trace.json
    A qapi/transaction.json
    A qapi/ui.json
    M qemu-img.c
    M qemu-nbd.c
    M qobject/Makefile.objs
    A qobject/qlit.c
    M qom/object.c
    M scripts/coccinelle/qobject.cocci
    M scripts/qapi-event.py
    M scripts/qapi-types.py
    M scripts/qapi-visit.py
    M scripts/qapi.py
    M target/i386/cpu.c
    M tests/Makefile.include
    M tests/check-qjson.c
    A tests/check-qlit.c
    M tests/check-qom-proplist.c
    A tests/qapi-schema/alternate-conflict-bool-string.err
    A tests/qapi-schema/alternate-conflict-bool-string.exit
    A tests/qapi-schema/alternate-conflict-bool-string.json
    A tests/qapi-schema/alternate-conflict-bool-string.out
    A tests/qapi-schema/alternate-conflict-num-string.err
    A tests/qapi-schema/alternate-conflict-num-string.exit
    A tests/qapi-schema/alternate-conflict-num-string.json
    A tests/qapi-schema/alternate-conflict-num-string.out
    M tests/qmp-test.c
    M tests/test-qapi-util.c
    M tests/test-qobject-input-visitor.c
    M tests/test-qobject-output-visitor.c
    M tests/test-string-input-visitor.c
    M tests/test-string-output-visitor.c
    M tpm.c
    M ui/input-legacy.c
    M ui/input.c
    M ui/vnc.c
    M util/keyval.c
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-09-01-v3' 
into staging

QAPI patches for 2017-09-01

# gpg: Signature made Mon 04 Sep 2017 12:30:31 BST
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <address@hidden>"
# gpg:                 aka "Markus Armbruster <address@hidden>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2017-09-01-v3: (47 commits)
  qapi: drop the sentinel in enum array
  qapi: Change data type of the FOO_lookup generated for enum FOO
  qapi: Convert indirect uses of FOO_lookup[...] to qapi_enum_lookup()
  qapi: Mechanically convert FOO_lookup[...] to FOO_str(...)
  qapi: Generate FOO_str() macro for QAPI enum FOO
  qapi: Avoid unnecessary use of enum lookup table's sentinel
  qapi: Use qapi_enum_parse() in input_type_enum()
  crypto: Use qapi_enum_parse() in qcrypto_block_luks_name_lookup()
  quorum: Use qapi_enum_parse() in quorum_open()
  block: Use qemu_enum_parse() in blkdebug_debug_breakpoint()
  hmp: Use qapi_enum_parse() in hmp_migrate_set_parameter()
  hmp: Use qapi_enum_parse() in hmp_migrate_set_capability()
  tpm: Clean up model registration & lookup
  tpm: Clean up driver registration & lookup
  qapi: Drop superfluous qapi_enum_parse() parameter max
  qapi: Update qapi-code-gen.txt examples to match current code
  qapi-schema: Improve section headings
  qapi-schema: Move queries from common.json to qapi-schema.json
  qapi-schema: Make block-core.json self-contained
  qapi-schema: Fold event.json back into qapi-schema.json
  ...

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/32f0f68bb772...98bfaac788be