[Qemu-commits] [qemu/qemu] f19e44: hmp: Fix warning from smatch (wrong argument in fu...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: f19e44bc9d5b9302d9ca4dcee52de3fc5d8b50f5
      
https://github.com/qemu/qemu/commit/f19e44bc9d5b9302d9ca4dcee52de3fc5d8b50f5
  Author: Stefan Weil <address@hidden>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M hmp.c

  Log Message:
  -----------
  hmp: Fix warning from smatch (wrong argument in function call)

Fix this warning:
hmp.c:414:38: warning: Using plain integer as NULL pointer

qmp_query_block expects a pointer argument, so passing false is wrong.

Cc: Luiz Capitulino <address@hidden>
Signed-off-by: Stefan Weil <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 438e8289d7746188f0684313d25d38d2a77747c9
      
https://github.com/qemu/qemu/commit/438e8289d7746188f0684313d25d38d2a77747c9
  Author: Eric Blake <address@hidden>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M balloon.c

  Log Message:
  -----------
  balloon: Fix typo

Commit 422e0501 introduced a typo (unless removing an 'o' from
balloon is how you deflate it?)

Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 606ee8f5eadd79627216bbdde4da0337cb7d4360
      
https://github.com/qemu/qemu/commit/606ee8f5eadd79627216bbdde4da0337cb7d4360
  Author: Gonglei <address@hidden>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: Fix missing err = NULL in client_migrate_info()

When SPICE isn't used, we either fail an assertion in error_set(),
or leak an error object.  Broken in commit b25d81b.

Cc: Markus Armbruster <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 912ae9c88669d0a0cbae1f20b8c80dde8e526251
      
https://github.com/qemu/qemu/commit/912ae9c88669d0a0cbae1f20b8c80dde8e526251
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M scripts/qapi-types.py

  Log Message:
  -----------
  qapi-types: add C99 index names to arrays

It's not easy to figure out how monitor translates
strings: most QEMU code deals with translated indexes,
these are translated using _lookup arrays,
so you need to find the array name, and find the
appropriate offset.

This patch adds C99 indexes to lookup arrays, which makes it possible to
find the correct key using simple grep, and see that the matching is
correct at a glance.

Example:

Before:

const char *MigrationCapability_lookup[] = {
    "xbzrle",
    "rdma-pin-all",
    "auto-converge",
    "zero-blocks",
    NULL,
};

After:

const char *MigrationCapability_lookup[] = {
    [MIGRATION_CAPABILITY_XBZRLE] = "xbzrle",
    [MIGRATION_CAPABILITY_RDMA_PIN_ALL] = "rdma-pin-all",
    [MIGRATION_CAPABILITY_AUTO_CONVERGE] = "auto-converge",
    [MIGRATION_CAPABILITY_ZERO_BLOCKS] = "zero-blocks",
    [MIGRATION_CAPABILITY_MAX] = NULL,
};

Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 041ccc922ee474693a2869d4e3b59e920c739bc0
      
https://github.com/qemu/qemu/commit/041ccc922ee474693a2869d4e3b59e920c739bc0
  Author: Peter Maydell <address@hidden>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M balloon.c
    M hmp.c
    M monitor.c
    M scripts/qapi-types.py

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging

* remotes/qmp-unstable/queue/qmp:
  qapi-types: add C99 index names to arrays
  monitor: Fix missing err = NULL in client_migrate_info()
  balloon: Fix typo
  hmp: Fix warning from smatch (wrong argument in function call)

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


Compare: https://github.com/qemu/qemu/compare/2559db069628...041ccc922ee4