Skip to content
Snippets Groups Projects
  1. Apr 28, 2023
  2. Apr 27, 2023
  3. Apr 26, 2023
    • Richard Henderson's avatar
      Merge tag 'pull-qapi-2023-04-26' of https://repo.or.cz/qemu/armbru into staging · c3f9aa8e
      Richard Henderson authored
      QAPI patches patches for 2023-04-26
      
      # -----BEGIN PGP SIGNATURE-----
      #
      # iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmRIvOkSHGFybWJydUBy
      # ZWRoYXQuY29tAAoJEDhwtADrkYZTX3MQAIqrKQbOzQ81/cDZ7aeLOroDoGYf1Cs0
      # 0NiEVlyoblWNzL3HraGgXiNRTP+zaG/TcFKza1nz8qjdkxWxBjdbfF5Lm6mQf5Zo
      # tcHUjksmnUlPkLYSOyEjfY9SNvcS6g7djE/NF5lbJtzYGZScZpLarELR7oUvrcXR
      # AEiw8N5FZXp+j6cTeWvrLzSqz9qBsFJUCGcGER0T/Mt5MlUwDexE1xe7g8oD5l+b
      # s0jeQr1PTZm5k6ehajQtgbHvAkgH8xVTKqbB/U5iz4VhYriH+IPEOtfCFt6/1soz
      # pVkYikJpazCvQMjqnWu9dE1onthgSsEIOV29kFU0Kr8ATZuJBQMuLVp4hSsbKANj
      # BUVyL2/fUsIp7gd+KikXUOjKYajxek6Q2YLAPpL+1pBCTql/PBQ7td8CECdiv/9e
      # Xh50q+BGvyEiyoyf4EEpaLXUZog605WHEaODj9uPtNHJP9x6Rqt93FUsdWUtt/k9
      # hJ8RSKy8njr0vxGoJkj89m2XfCwtuX3VQ5IXvv/If4U5Y4+JhcLtiqW+Njh8fAM4
      # ZwIrlUYG7inLUKFVcQ3sEGpaj611i5ixIxctUvEiggZX+fPeSFKYUr+Rq8WXM8gv
      # suLXz7VF6H4Sw30lCvdQ4LSungbzlYAtQYpmdEQGoM8iasIi4PoDf0cTYBbMYHDX
      # +pZvWC50cVtf
      # =wLx6
      # -----END PGP SIGNATURE-----
      # gpg: Signature made Wed 26 Apr 2023 06:55:53 AM BST
      # 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-2023-04-26' of https://repo.or.cz/qemu/armbru
      
      :
        qapi: allow unions to contain further unions
        qapi: Improve specificity of type/member descriptions
        qapi: support updating expected test output via make
        qapi: Require boxed for conditional command and event arguments
        qapi: Fix code generated for optional conditional struct member
        tests/qapi-schema: Cover optional conditional struct member
        tests/qapi-schema: Clean up positive test for conditionals
        tests/qapi-schema: Rename a few conditionals
        tests/qapi-schema: Improve union discriminator coverage
        qapi: Fix to reject 'data': 'mumble' in struct
        qapi: Fix error message when type name or array is expected
        qapi: Simplify code a bit after previous commits
        qapi: Improve error message for unexpected array types
        qapi: Split up check_type()
        qapi: Clean up after removal of simple unions
        qapi/schema: Use super()
        qapi: Fix error message format regression
      
      Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
      c3f9aa8e
    • Richard Henderson's avatar
      Merge tag 'for-upstream' of https://repo.or.cz/qemu/kevin into staging · 4d1467a5
      Richard Henderson authored
      Block layer patches
      
      - Protect BlockBackend.queued_requests with its own lock
      - Switch to AIO_WAIT_WHILE_UNLOCKED() where possible
      - AioContext removal: LinuxAioState/LuringState/ThreadPool
      - Add more coroutine_fn annotations, use bdrv/blk_co_*
      - Fix crash when execute hmp_commit
      
      # -----BEGIN PGP SIGNATURE-----
      #
      # iQJFBAABCAAvFiEE3D3rFZqa+V09dFb+fwmycsiPL9YFAmRH0b0RHGt3b2xmQHJl
      # ZGhhdC5jb20ACgkQfwmycsiPL9Y0yw/6A/vzA4TGgFUP3WIvH/sQri4/V3gyR+PT
      # u3hOQUCYZ99nioTpKV91TSuUPuU/Mdspy/0NKM+K92yIXqxa9172A2zLOsGOu21l
      # qKpse+nBf1zqEgB8YzUHyCBdetPz916C/f9RS26SNUCW85GCHYGHA3u7nKvWLMyV
      # oKIoTlA8QOglOuEKlRoYh7hCFm7ET51NOSEftm8GsYbsW/I2Vzl8a1SHN1lHufjd
      # We3+898zUrmFqNMp6Rjdhn+yZmmoGzoZqV4YQi83z7xjiv+Ms4VHVVW7X8d20xRX
      # 5BLFiLHAuZ/1d26HyVhgBUr7KHyf94odocz8BylWKXGl5SXMCZun1Td1vgVKlGK+
      # GRxzB2cWGWqzC2UmqSTc0Z0aIWbXukKwvcX76uBKsQZ+kB2A7jFobxHiaoQEDJ8B
      # WRNEMH2+CqCAu9rsrNRinnJKhT2nXcr9F9YfwRIlagdAePGWin+EUW8huf14dDBm
      # Z2Y34aKW4RQibF8xirMHeRBbOLmcq2VpKLKwNfBHUDgZB8iuD7bLn4n9nwWXMG1w
      # zgNsTybkv46vLPamTpEaUoNTHfuRDTAuE7Z7lkcc7jF41Z0V1DC/DCCWcL/0LvhP
      # GIxFdkYug3hetdF2U/OZhUoEfxvkqcuBnrr55LFzqheKEllQpPwPpt7UF0aH8bg3
      # i/YpjHsf3xU=
      # =mpYX
      # -----END PGP SIGNATURE-----
      # gpg: Signature made Tue 25 Apr 2023 02:12:29 PM BST
      # gpg:                using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6
      # gpg:                issuer "kwolf@redhat.com"
      # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
      
      * tag 'for-upstream' of https://repo.or.cz/qemu/kevin
      
      : (25 commits)
        block/monitor: Fix crash when executing HMP commit
        vmdk: make vmdk_is_cid_valid a coroutine_fn
        qcow2: mark various functions as coroutine_fn and GRAPH_RDLOCK
        tests: mark more coroutine_fns
        qemu-pr-helper: mark more coroutine_fns
        9pfs: mark more coroutine_fns
        nbd: mark more coroutine_fns, do not use co_wrappers
        mirror: make mirror_flush a coroutine_fn, do not use co_wrappers
        blkdebug: add missing coroutine_fn annotation
        vvfat: mark various functions as coroutine_fn
        thread-pool: avoid passing the pool parameter every time
        thread-pool: use ThreadPool from the running thread
        io_uring: use LuringState from the running thread
        linux-aio: use LinuxAioState from the running thread
        block: add missing coroutine_fn to bdrv_sum_allocated_file_size()
        include/block: fixup typos
        monitor: convert monitor_cleanup() to AIO_WAIT_WHILE_UNLOCKED()
        hmp: convert handle_hmp_command() to AIO_WAIT_WHILE_UNLOCKED()
        block: convert bdrv_drain_all_begin() to AIO_WAIT_WHILE_UNLOCKED()
        block: convert bdrv_graph_wrlock() to AIO_WAIT_WHILE_UNLOCKED()
        ...
      
      Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
      4d1467a5
    • Daniel P. Berrangé's avatar
      qapi: allow unions to contain further unions · a17dbc4b
      Daniel P. Berrangé authored
      
      This extends the QAPI schema validation to permit unions inside unions,
      provided the checks for clashing fields pass.
      
      Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
      Signed-off-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
      Message-Id: <20230420102619.348173-4-berrange@redhat.com>
      Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
      a17dbc4b
    • Markus Armbruster's avatar
      qapi: Improve specificity of type/member descriptions · 1e148b54
      Markus Armbruster authored
      
      Error messages describe object members, enumeration values, features,
      and variants like ROLE 'NAME', where ROLE is "member", "value",
      "feature", or "branch", respectively.  When the member is defined in
      another type, e.g. inherited from a base type, we add "of type
      'TYPE'".  Example: test case struct-base-clash-deep reports a member
      of type 'Sub' clashing with a member of its base type 'Base' as
      
          struct-base-clash-deep.json: In struct 'Sub':
          struct-base-clash-deep.json:10: member 'name' collides with member 'name' of type 'Base'
      
      Members of implicitly defined types need special treatment.  We don't
      want to add "of type 'TYPE'" for them, because their named are made up
      and mean nothing to the user.  Instead, we describe members of an
      implicitly defined base type as "base member 'NAME'", and command and
      event parameters as "parameter 'NAME'".  Example: test case
      union-bad-base reports member of a variant's type clashing with a
      member of its implicitly defined base type as
      
          union-bad-base.json: In union 'TestUnion':
          union-bad-base.json:8: member 'string' of type 'TestTypeA' collides with base member 'string'
      
      The next commit will permit unions as variant types.  "base member
      'NAME' would then be ambigious: is it the union's base, or is it the
      union's variant's base?  One of its test cases would report a clash
      between two such bases as "base member 'type' collides with base
      member 'type'".  Confusing.
      
      Refine the special treatment: add "of TYPE" even for implicitly
      defined types, but massage TYPE and ROLE so they make sense for the
      user.
      
      Message-Id: <20230420102619.348173-3-berrange@redhat.com>
      Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
      Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
      1e148b54
  4. Apr 25, 2023
Loading