[Qemu-commits] [qemu/qemu] a58069: qapi-schema: support alternates with

qemu-commits

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] a58069: qapi-schema: support alternates with

From:	Richard Henderson
Subject:	[Qemu-commits] [qemu/qemu] a58069: qapi-schema: support alternates with array type
Date:	Thu, 21 Apr 2022 10:55:50 -0700

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: a58069494ded1282c36b7fca8d67bf487c160983
      
https://github.com/qemu/qemu/commit/a58069494ded1282c36b7fca8d67bf487c160983
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-04-21 (Thu, 21 Apr 2022)

  Changed paths:
    M scripts/qapi/expr.py
    M scripts/qapi/schema.py
    M tests/qapi-schema/alternate-array.err
    M tests/qapi-schema/alternate-array.json
    M tests/qapi-schema/alternate-array.out

  Log Message:
  -----------
  qapi-schema: support alternates with array type

Detect array types as alternate branches, and turn the JSON list into
a QAPISchemaArrayType.  Array types in an alternate are represented with
QTYPE_QLIST in the type field.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220321164243.200569-2-pbonzini@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: b36dc5c279706e23ed75f0a90dfe7195340a73cb
      
https://github.com/qemu/qemu/commit/b36dc5c279706e23ed75f0a90dfe7195340a73cb
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-04-21 (Thu, 21 Apr 2022)

  Changed paths:
    A tests/qapi-schema/alternate-conflict-lists.err
    A tests/qapi-schema/alternate-conflict-lists.json
    A tests/qapi-schema/alternate-conflict-lists.out
    M tests/qapi-schema/meson.build

  Log Message:
  -----------
  qapi-schema: test: add a qapi-schema-test for array alternates

Check that conflicts among array alternates are detected correctly.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220321164243.200569-3-pbonzini@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Expected test output alternate-conflict-lists.json corrected]
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 79db994861daadeeb9e852fba3831e9f3d5554c8
      
https://github.com/qemu/qemu/commit/79db994861daadeeb9e852fba3831e9f3d5554c8
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-04-21 (Thu, 21 Apr 2022)

  Changed paths:
    M tests/qapi-schema/qapi-schema-test.json
    M tests/qapi-schema/qapi-schema-test.out
    M tests/unit/test-qobject-input-visitor.c

  Log Message:
  -----------
  qapi-schema: test: add a unit test for parsing array alternates

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220321164243.200569-4-pbonzini@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Dead code dropped in test_visitor_in_alternate_list()]
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 659056b81ddb4fc81111e10d28d2dacd4dcdf315
      
https://github.com/qemu/qemu/commit/659056b81ddb4fc81111e10d28d2dacd4dcdf315
  Author: Andrea Bolognani <abologna@redhat.com>
  Date:   2022-04-21 (Thu, 21 Apr 2022)

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

  Log Message:
  -----------
  docs: qapi: Remove outdated reference to simple unions

Commit 4e99f4b12c0e dropped simple unions and updated most
documentation accordingly, but in one case we still claim that
there are "two flavors of unions".

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Message-Id: <20220420153408.243584-2-abologna@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: f43471297be23daea0333f4d84eec34cf866a47c
      
https://github.com/qemu/qemu/commit/f43471297be23daea0333f4d84eec34cf866a47c
  Author: Andrea Bolognani <abologna@redhat.com>
  Date:   2022-04-21 (Thu, 21 Apr 2022)

  Changed paths:
    M qapi/migration.json

  Log Message:
  -----------
  qapi: Fix documentation for query-xen-replication-status

The correct return type is ReplicationStatus, not
ReplicationResult.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Message-Id: <20220420153408.243584-3-abologna@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 068613f065e4200f6e32862deb4e18250e5dca3a
      
https://github.com/qemu/qemu/commit/068613f065e4200f6e32862deb4e18250e5dca3a
  Author: Andrea Bolognani <abologna@redhat.com>
  Date:   2022-04-21 (Thu, 21 Apr 2022)

  Changed paths:
    M qapi/sockets.json

  Log Message:
  -----------
  qapi: Fix typo

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Message-Id: <20220420153408.243584-4-abologna@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: de7371bc7c39ccacb963acb5129b261087967070
      
https://github.com/qemu/qemu/commit/de7371bc7c39ccacb963acb5129b261087967070
  Author: Dov Murik <dovmurik@linux.ibm.com>
  Date:   2022-04-21 (Thu, 21 Apr 2022)

  Changed paths:
    M qapi/misc-target.json

  Log Message:
  -----------
  qapi: Fix version of cpu0-id field

Commit 811b4ec7f8eb ("qapi, target/i386/sev: Add cpu0-id to
query-sev-capabilities") wrongly stated that the new field is available
since version 7.0.

Fix the QAPI documentation to state that the cpu0-id field is included
since 7.1.

Signed-off-by: Dov Murik <dovmurik@linux.ibm.com>
Message-Id: <20220420190129.3532623-1-dovmurik@linux.ibm.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 378f973a6ce89de16496bc6007f4dffa2f881dbc
      
https://github.com/qemu/qemu/commit/378f973a6ce89de16496bc6007f4dffa2f881dbc
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2022-04-21 (Thu, 21 Apr 2022)

  Changed paths:
    M docs/devel/qapi-code-gen.rst
    M qapi/migration.json
    M qapi/misc-target.json
    M qapi/sockets.json
    M scripts/qapi/expr.py
    M scripts/qapi/schema.py
    M tests/qapi-schema/alternate-array.err
    M tests/qapi-schema/alternate-array.json
    M tests/qapi-schema/alternate-array.out
    A tests/qapi-schema/alternate-conflict-lists.err
    A tests/qapi-schema/alternate-conflict-lists.json
    A tests/qapi-schema/alternate-conflict-lists.out
    M tests/qapi-schema/meson.build
    M tests/qapi-schema/qapi-schema-test.json
    M tests/qapi-schema/qapi-schema-test.out
    M tests/unit/test-qobject-input-visitor.c

  Log Message:
  -----------
  Merge tag 'pull-qapi-2022-04-21' of git://repo.or.cz/qemu/armbru into staging

QAPI patches patches for 2022-04-21

# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmJhZgISHGFybWJydUBy
# ZWRoYXQuY29tAAoJEDhwtADrkYZTuZQP/iesk/r4ytyk+q+ksNCQHTZl4B4uZcbI
# TgbA1dwbwkKOfNaqByKZzXvbymL9Y4RpZavZ0i1qa3hK5orKHThLK4omRaFD+SPp
# sH53TeTgkG/UNUQk00dim1BzuWJefqFo1rYSqvTzaXVPyx1Q9Gk9193q5zDTlMJs
# w6UKD+q+Yxne9aoi1IH2NzzEKElHz7MMFeBDsnxDbkedzBxY1Ka05IOI2ucXhJ7X
# mYTZxHsrjncW4qJNkf57u9y4faNDIBeT3vkFqBaIeTXSSqm+xO1rkLanGOLQKtIM
# zD6JDMcqsIkZttEy0QCOrjKvMueWaOTZsS0sbdCC+JpBAbyVeS83kmRyYwEhyGre
# FJzf81zcEH6FtnDYudWWUT7hKV6sHWbw+4ho5WTkCYnr/Cfqr3TyDbSW+f/eIxUK
# vaujP/8MTypS4p0mx4QfM2/eO05oZHwEaslOn0gkg7siAJWuC7KUkkWSwz6ZNZCp
# qj/+jtDRGhvB4bGFusciqwtbnLNtVPX2meUuVxK74lmKa00+zXraNFfvGIxfzzC0
# pJ6weJj2jMLo5OEsZ2xWfNqhDigFQYxbGR8X3N2hg5GZTx1k5WXx7mRz3GlAwd8Q
# /4hcTBXKTFxDNxXqzL2eHBtaruKHjnHoVo2eAodyF+9FqErInjr/wisVm6I+R8NR
# Z94UBs8lvMIC
# =a3AD
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 21 Apr 2022 07:11:14 AM PDT
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [undefined]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* tag 'pull-qapi-2022-04-21' of git://repo.or.cz/qemu/armbru:
  qapi: Fix version of cpu0-id field
  qapi: Fix typo
  qapi: Fix documentation for query-xen-replication-status
  docs: qapi: Remove outdated reference to simple unions
  qapi-schema: test: add a unit test for parsing array alternates
  qapi-schema: test: add a qapi-schema-test for array alternates
  qapi-schema: support alternates with array type

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/28298069afff...378f973a6ce8

[Prev in Thread]

Current Thread

[Next in Thread]

[Qemu-commits] [qemu/qemu] a58069: qapi-schema: support alternates with array type, Richard Henderson <=
- [Qemu-commits] [qemu/qemu] a58069: qapi-schema: support alternates with array type, Richard Henderson, 2022/04/21

Prev by Date: [Qemu-commits] [qemu/qemu] 951cc9: glib-compat: isolate g_date_time_format_iso8601 ve...
Next by Date: [Qemu-commits] [qemu/qemu] a58069: qapi-schema: support alternates with array type
Previous by thread: [Qemu-commits] [qemu/qemu] 951cc9: glib-compat: isolate g_date_time_format_iso8601 ve...
Next by thread: [Qemu-commits] [qemu/qemu] a58069: qapi-schema: support alternates with array type
Index(es):
- Date
- Thread