[Qemu-commits] [qemu/qemu] 5e39d8: numa-test: fix query-cpus leaks

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 5e39d89d20b17cf6fb7f09d181d34f17b2ae2160
      
https://github.com/qemu/qemu/commit/5e39d89d20b17cf6fb7f09d181d34f17b2ae2160
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    M tests/numa-test.c

  Log Message:
  -----------
  numa-test: fix query-cpus leaks

Fix test leaks introduced in commit 2941020a476.

(and small extra space removed)

Spotted by ASAN.

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: f892291eee376505cfec8b6cade7ccf952a6d3e0
      
https://github.com/qemu/qemu/commit/f892291eee376505cfec8b6cade7ccf952a6d3e0
  Author: Eduardo Habkost <address@hidden>
  Date:   2017-05-30 (Tue, 30 May 2017)

  Changed paths:
    M numa.c

  Log Message:
  -----------
  numa: Fix format string for "Invalid node" message

Some compilers complain about the PRIu16 format string with the
MAX(src, dst) and MAX_NODES arguments.  Example output from Apple LLVM
version 7.3.0 (clang-703.0.31):

  numa.c:236:20: warning: format specifies type 'unsigned short' but the 
argument has type 'int' [-Wformat]
               MAX(src, dst), MAX_NODES);
  ~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~
  include/qapi/error.h:163:35: note: expanded from macro 'error_setg'
                    (fmt), ## __VA_ARGS__)
                              ^~~~~~~~~~~
  glib/2.52.2/include/glib-2.0/glib/gmacros.h:288:20: note: expanded from macro 
'MAX'
  #define MAX(a, b)  (((a) > (b)) ? (a) : (b))
               ^~~~~~~~~~~~~~~~~~~~~~~~~
  numa.c:236:35: warning: format specifies type 'unsigned short' but the 
argument has type 'int' [-Wformat]
               MAX(src, dst), MAX_NODES);
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~
  include/qapi/error.h:163:35: note: expanded from macro 'error_setg'
                    (fmt), ## __VA_ARGS__)
                              ^~~~~~~~~~~
  include/sysemu/sysemu.h:165:19: note: expanded from macro 'MAX_NODES'
  #define MAX_NODES 128
              ^~~
MAX(src, dst) promotes the src and dst arguments to int, and MAX_NODES
is an int.  Use %d to silence those warnings.

Signed-off-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 70f31414e71250c6049a46851372ee6ea76f40dd
      
https://github.com/qemu/qemu/commit/70f31414e71250c6049a46851372ee6ea76f40dd
  Author: Peter Maydell <address@hidden>
  Date:   2017-06-01 (Thu, 01 Jun 2017)

  Changed paths:
    M numa.c
    M tests/numa-test.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into 
staging

NUMA fixes, 2017-05-30

# gpg: Signature made Tue 30 May 2017 20:10:44 BST
# gpg:                using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <address@hidden>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/numa-pull-request:
  numa: Fix format string for "Invalid node" message
  numa-test: fix query-cpus leaks

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


Compare: https://github.com/qemu/qemu/compare/0748b3526e8c...70f31414e712