[Qemu-devel] [PULL 00/10] QAPI patches for 2017-07-18

Markus Armbruster posted 10 patches 6 years, 8 months ago
Failed in applying to current master (apply log)
Test FreeBSD passed
Test checkpatch passed
Test docker passed
Test s390x passed
There is a newer version of this series
blockdev.c                              |  14 +++++
docs/devel/qapi-code-gen.txt            |  10 +--
hmp.c                                   |  88 ++++++++++++--------------
hw/ppc/spapr_drc.c                      |   7 ++-
include/qapi/qmp/qobject.h              |  10 ++-
include/qapi/visitor-impl.h             |   3 +-
include/qapi/visitor.h                  |   8 +--
include/qemu/typedefs.h                 |   1 +
migration/migration.c                   |  34 +++++++---
qapi-schema.json                        | 108 ++++++++++++++++++++++++++++----
qapi/block-core.json                    |  29 ++++++---
qapi/qapi-clone-visitor.c               |   5 +-
qapi/qapi-dealloc-visitor.c             |   6 +-
qapi/qapi-visit-core.c                  |   7 ++-
qapi/qobject-input-visitor.c            |   6 +-
qapi/qobject-output-visitor.c           |   5 +-
qapi/string-input-visitor.c             |   8 ++-
qapi/string-output-visitor.c            |   3 +-
qapi/trace-events                       |   2 +-
qobject/json-parser.c                   |   2 +-
qobject/qnull.c                         |   8 ++-
scripts/qapi.py                         |   5 +-
target/i386/cpu.c                       |   4 +-
target/ppc/translate_init.c             |  10 ++-
tests/check-qjson.c                     |   6 +-
tests/check-qnull.c                     |  27 ++++----
tests/qapi-schema/qapi-schema-test.json |   3 +-
tests/qapi-schema/qapi-schema-test.out  |   1 +
tests/qemu-iotests/085                  |   2 +-
tests/qemu-iotests/139                  |   2 +-
tests/test-qobject-input-visitor.c      |  24 ++++---
tests/test-qobject-output-visitor.c     |  13 +++-
32 files changed, 326 insertions(+), 135 deletions(-)
[Qemu-devel] [PULL 00/10] QAPI patches for 2017-07-18
Posted by Markus Armbruster 6 years, 8 months ago
The following changes since commit 49bcce4b9c11759678fd223aefb48691c4959d4f:

  Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-07-12' into staging (2017-07-13 16:56:06 +0100)

are available in the git repository at:

  git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2017-07-18

for you to fetch changes up to 4f11e88cbda71af50302c32d97b4f8122555027e:

  migration: Use JSON null instead of "" to reset parameter to default (2017-07-18 22:21:58 +0200)

----------------------------------------------------------------
QAPI patches for 2017-07-18

----------------------------------------------------------------
Markus Armbruster (10):
      qapi: Separate type QNull from QObject
      qapi: Use QNull for a more regular visit_type_null()
      qapi: Introduce a first class 'null' type
      tests/test-qobject-input-visitor: Drop redundant test
      block: Use JSON null instead of "" to disable backing file
      hmp: Clean up and simplify hmp_migrate_set_parameter()
      migration: Clean up around tls_creds, tls_hostname
      migration: Add TODO comments on duplication of QAPI_CLONE()
      migration: Unshare MigrationParameters struct for now
      migration: Use JSON null instead of "" to reset parameter to default

 blockdev.c                              |  14 +++++
 docs/devel/qapi-code-gen.txt            |  10 +--
 hmp.c                                   |  88 ++++++++++++--------------
 hw/ppc/spapr_drc.c                      |   7 ++-
 include/qapi/qmp/qobject.h              |  10 ++-
 include/qapi/visitor-impl.h             |   3 +-
 include/qapi/visitor.h                  |   8 +--
 include/qemu/typedefs.h                 |   1 +
 migration/migration.c                   |  34 +++++++---
 qapi-schema.json                        | 108 ++++++++++++++++++++++++++++----
 qapi/block-core.json                    |  29 ++++++---
 qapi/qapi-clone-visitor.c               |   5 +-
 qapi/qapi-dealloc-visitor.c             |   6 +-
 qapi/qapi-visit-core.c                  |   7 ++-
 qapi/qobject-input-visitor.c            |   6 +-
 qapi/qobject-output-visitor.c           |   5 +-
 qapi/string-input-visitor.c             |   8 ++-
 qapi/string-output-visitor.c            |   3 +-
 qapi/trace-events                       |   2 +-
 qobject/json-parser.c                   |   2 +-
 qobject/qnull.c                         |   8 ++-
 scripts/qapi.py                         |   5 +-
 target/i386/cpu.c                       |   4 +-
 target/ppc/translate_init.c             |  10 ++-
 tests/check-qjson.c                     |   6 +-
 tests/check-qnull.c                     |  27 ++++----
 tests/qapi-schema/qapi-schema-test.json |   3 +-
 tests/qapi-schema/qapi-schema-test.out  |   1 +
 tests/qemu-iotests/085                  |   2 +-
 tests/qemu-iotests/139                  |   2 +-
 tests/test-qobject-input-visitor.c      |  24 ++++---
 tests/test-qobject-output-visitor.c     |  13 +++-
 32 files changed, 326 insertions(+), 135 deletions(-)

-- 
2.7.5


Re: [Qemu-devel] [PULL 00/10] QAPI patches for 2017-07-18
Posted by Peter Maydell 6 years, 8 months ago
On 18 July 2017 at 21:29, Markus Armbruster <armbru@redhat.com> wrote:
> The following changes since commit 49bcce4b9c11759678fd223aefb48691c4959d4f:
>
>   Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-07-12' into staging (2017-07-13 16:56:06 +0100)
>
> are available in the git repository at:
>
>   git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2017-07-18
>
> for you to fetch changes up to 4f11e88cbda71af50302c32d97b4f8122555027e:
>
>   migration: Use JSON null instead of "" to reset parameter to default (2017-07-18 22:21:58 +0200)
>
> ----------------------------------------------------------------
> QAPI patches for 2017-07-18
>
> ----------------------------------------------------------------
> Markus Armbruster (10):
>       qapi: Separate type QNull from QObject
>       qapi: Use QNull for a more regular visit_type_null()
>       qapi: Introduce a first class 'null' type
>       tests/test-qobject-input-visitor: Drop redundant test
>       block: Use JSON null instead of "" to disable backing file
>       hmp: Clean up and simplify hmp_migrate_set_parameter()
>       migration: Clean up around tls_creds, tls_hostname
>       migration: Add TODO comments on duplication of QAPI_CLONE()
>       migration: Unshare MigrationParameters struct for now
>       migration: Use JSON null instead of "" to reset parameter to default

Hi -- I'm afraid this has a merge conflict in migration/migration.c
that looks too complicated for me to sort out. Can you rebase
and resend, please?

thanks
-- PMM