[Qemu-devel] [PULL 00/10] QAPI patches for 2018-06-22

Markus Armbruster posted 10 patches 7 years, 7 months ago
Failed in applying to current master (apply log)
MAINTAINERS                                        |  3 +-
Makefile                                           |  6 +--
block/qcow2.c                                      |  1 -
cpus.c                                             |  2 -
docs/devel/qapi-code-gen.txt                       |  8 ++--
qapi/block-core.json                               | 52 ++--------------------
qapi/crypto.json                                   | 13 +-----
qapi/misc.json                                     | 46 +------------------
qapi/net.json                                      | 12 -----
qapi/ui.json                                       | 19 +-------
qobject/block-qdict.c                              | 19 ++++++--
scripts/qapi/common.py                             | 32 ++++++++-----
scripts/qapi/events.py                             |  5 ++-
scripts/qapi/introspect.py                         |  5 +--
scripts/qapi/types.py                              |  2 +
scripts/qapi/visit.py                              | 21 ++++++---
tests/Makefile.include                             |  7 ++-
tests/check-block-qdict.c                          | 33 ++++++++++++++
tests/qapi-schema/flat-union-incomplete-branch.err |  1 -
.../qapi-schema/flat-union-incomplete-branch.exit  |  1 -
.../qapi-schema/flat-union-incomplete-branch.json  |  9 ----
tests/qapi-schema/flat-union-incomplete-branch.out |  0
tests/qapi-schema/qapi-schema-test.json            |  6 ++-
tests/qapi-schema/qapi-schema-test.out             |  3 +-
24 files changed, 116 insertions(+), 190 deletions(-)
delete mode 100644 tests/qapi-schema/flat-union-incomplete-branch.err
delete mode 100644 tests/qapi-schema/flat-union-incomplete-branch.exit
delete mode 100644 tests/qapi-schema/flat-union-incomplete-branch.json
delete mode 100644 tests/qapi-schema/flat-union-incomplete-branch.out
[Qemu-devel] [PULL 00/10] QAPI patches for 2018-06-22
Posted by Markus Armbruster 7 years, 7 months ago
The following changes since commit 45eb6fb6cea28cdc937764aac6585751047bb294:

  nbd/server: Silence gcc false positive (2018-06-22 14:18:36 +0100)

are available in the Git repository at:

  git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2018-06-22

for you to fetch changes up to be25fcc4d2faeb3ffa8db813272963bae659c4c2:

  MAINTAINERS: Update QAPI stanza for commit fb0bc835e56 (2018-06-22 16:33:47 +0200)

----------------------------------------------------------------
QAPI patches for 2018-06-22

----------------------------------------------------------------
Anton Nefedov (2):
      qapi: allow empty branches in flat unions
      qapi: remove empty flat union branches and types

Marc-André Lureau (2):
      qapi/visit: remove useless prefix argument
      qapi/events: generate event enum in main module

Markus Armbruster (3):
      qapi: Open files with encoding='utf-8'
      qapi/introspect: Eliminate pointless variable in .visit_end()
      MAINTAINERS: Update QAPI stanza for commit fb0bc835e56

Matthias Maier (1):
      Revert commit d4e5ec877ca

Max Reitz (2):
      qdict: Make qdict_flatten() shallow-clone-friendly
      tests: Add QDict clone-flatten test

 MAINTAINERS                                        |  3 +-
 Makefile                                           |  6 +--
 block/qcow2.c                                      |  1 -
 cpus.c                                             |  2 -
 docs/devel/qapi-code-gen.txt                       |  8 ++--
 qapi/block-core.json                               | 52 ++--------------------
 qapi/crypto.json                                   | 13 +-----
 qapi/misc.json                                     | 46 +------------------
 qapi/net.json                                      | 12 -----
 qapi/ui.json                                       | 19 +-------
 qobject/block-qdict.c                              | 19 ++++++--
 scripts/qapi/common.py                             | 32 ++++++++-----
 scripts/qapi/events.py                             |  5 ++-
 scripts/qapi/introspect.py                         |  5 +--
 scripts/qapi/types.py                              |  2 +
 scripts/qapi/visit.py                              | 21 ++++++---
 tests/Makefile.include                             |  7 ++-
 tests/check-block-qdict.c                          | 33 ++++++++++++++
 tests/qapi-schema/flat-union-incomplete-branch.err |  1 -
 .../qapi-schema/flat-union-incomplete-branch.exit  |  1 -
 .../qapi-schema/flat-union-incomplete-branch.json  |  9 ----
 tests/qapi-schema/flat-union-incomplete-branch.out |  0
 tests/qapi-schema/qapi-schema-test.json            |  6 ++-
 tests/qapi-schema/qapi-schema-test.out             |  3 +-
 24 files changed, 116 insertions(+), 190 deletions(-)
 delete mode 100644 tests/qapi-schema/flat-union-incomplete-branch.err
 delete mode 100644 tests/qapi-schema/flat-union-incomplete-branch.exit
 delete mode 100644 tests/qapi-schema/flat-union-incomplete-branch.json
 delete mode 100644 tests/qapi-schema/flat-union-incomplete-branch.out

-- 
2.17.1


Re: [Qemu-devel] [PULL 00/10] QAPI patches for 2018-06-22
Posted by Peter Maydell 7 years, 7 months ago
On 22 June 2018 at 16:32, Markus Armbruster <armbru@redhat.com> wrote:
> The following changes since commit 45eb6fb6cea28cdc937764aac6585751047bb294:
>
>   nbd/server: Silence gcc false positive (2018-06-22 14:18:36 +0100)
>
> are available in the Git repository at:
>
>   git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2018-06-22
>
> for you to fetch changes up to be25fcc4d2faeb3ffa8db813272963bae659c4c2:
>
>   MAINTAINERS: Update QAPI stanza for commit fb0bc835e56 (2018-06-22 16:33:47 +0200)
>
> ----------------------------------------------------------------
> QAPI patches for 2018-06-22
>
> ----------------------------------------------------------------
Applied, thanks.

-- PMM