[Qemu-commits] [qemu/qemu] 57b729: util/error: Remove an unnecessary NULL check

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 57b7291e90aca93da41b32d264e96d313db87b42
      
https://github.com/qemu/qemu/commit/57b7291e90aca93da41b32d264e96d313db87b42
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-03-26 (Tue, 26 Mar 2019)

  Changed paths:
    M util/error.c

  Log Message:
  -----------
  util/error: Remove an unnecessary NULL check

This NULL check was required while introduced in 680d16dcb79f.
Later refactor added a NULL check in error_setv(), so this check
is now redundant.

Reviewed-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: ad85b0b4c737d59bcdfba1e75b9a202e12fb5349
      
https://github.com/qemu/qemu/commit/ad85b0b4c737d59bcdfba1e75b9a202e12fb5349
  Author: Markus Armbruster <address@hidden>
  Date:   2019-03-26 (Tue, 26 Mar 2019)

  Changed paths:
    M hw/block/xen-block.c

  Log Message:
  -----------
  xen-block: Replace qdict_put_obj() by qdict_put() where appropriate

Patch created mechanically by rerunning:

    $ spatch --sp-file scripts/coccinelle/qobject.cocci \
             --macro-file scripts/cocci-macro-file.h \
             --dir hw/block --in-place

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Acked-by: Paul Durrant <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>


  Commit: 19e8ff485a25001f48d7cbfaed24663dae001df7
      
https://github.com/qemu/qemu/commit/19e8ff485a25001f48d7cbfaed24663dae001df7
  Author: Liam Merwick <address@hidden>
  Date:   2019-03-26 (Tue, 26 Mar 2019)

  Changed paths:
    M qobject/json-lexer.c

  Log Message:
  -----------
  json: Fix off-by-one assert check in next_state()

The assert checking if the value of lexer->state in next_state(),
which is used as an index to the 'json_lexer' array, incorrectly
checks for an index value less than or equal to ARRAY_SIZE(json_lexer).
Fix assert so that it just checks for an index less than the array size.

Signed-off-by: Liam Merwick <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Li Qiang <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 413aeacd4b33f341472c153b18eeb5ff3a70239a
      
https://github.com/qemu/qemu/commit/413aeacd4b33f341472c153b18eeb5ff3a70239a
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2019-03-26 (Tue, 26 Mar 2019)

  Changed paths:
    M qapi/qmp-dispatch.c

  Log Message:
  -----------
  qapi/qmp-dispatch: fix return value in do_qmp_dispatch

There are no harm but just looks weird to return bool in
pointer-returning function. Introduced in 69240fe62d1 with the whole
failure-checking "if" chunk.

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 199f8d94be106f20dfce23fa4e157fc8d55fd494
      
https://github.com/qemu/qemu/commit/199f8d94be106f20dfce23fa4e157fc8d55fd494
  Author: Peter Maydell <address@hidden>
  Date:   2019-03-26 (Tue, 26 Mar 2019)

  Changed paths:
    M hw/block/xen-block.c
    M qapi/qmp-dispatch.c
    M qobject/json-lexer.c
    M util/error.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2019-03-26' into 
staging

Miscellaneous patches for 2019-03-26

# gpg: Signature made Tue 26 Mar 2019 07:10:23 GMT
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <address@hidden>" [full]
# gpg:                 aka "Markus Armbruster <address@hidden>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-misc-2019-03-26:
  qapi/qmp-dispatch: fix return value in do_qmp_dispatch
  json: Fix off-by-one assert check in next_state()
  xen-block: Replace qdict_put_obj() by qdict_put() where appropriate
  util/error: Remove an unnecessary NULL check

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


Compare: https://github.com/qemu/qemu/compare/4aef51963924...199f8d94be10