[Qemu-commits] [qemu/qemu] 857a0e: trace/simple: Fix warning and wrong trace file nam...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 857a0e387a6c91b5ea012aafae04c95eba314306
      
https://github.com/qemu/qemu/commit/857a0e387a6c91b5ea012aafae04c95eba314306
  Author: Stefan Weil <address@hidden>
  Date:   2015-11-30 (Mon, 30 Nov 2015)

  Changed paths:
    M trace/simple.c

  Log Message:
  -----------
  trace/simple: Fix warning and wrong trace file name for MinGW

On Windows, getpid() always returns an int value, but pid_t (which is
expected by the format string) is either a 32 bit or a 64 bit value.

Without a type cast (or a modified format string), the compiler prints
a warning when building for 64 bit Windows and the resulting trace_file_name
will include a wrong pid:

trace/simple.c:332:9: warning:
 format ‘%lld’ expects argument of type ‘long long int’,
 but argument 2 has type ‘int’ [-Wformat=]

Signed-off-by: Stefan Weil <address@hidden>


  Commit: a28c2f2df7679e3a87789e9fb7ed69331f697297
      
https://github.com/qemu/qemu/commit/a28c2f2df7679e3a87789e9fb7ed69331f697297
  Author: Stefan Weil <address@hidden>
  Date:   2015-11-30 (Mon, 30 Nov 2015)

  Changed paths:
    M include/sysemu/os-win32.h
    M util/oslib-win32.c

  Log Message:
  -----------
  oslib-win32: Change return type of function getpagesize

getpagesize on Linux returns an int. Fix QEMU's implementation for
Windows to return an int (instead of size_t), too.

This fixes a compiler warning which was introduced recently
(commit 093e3c42).

Signed-off-by: Stefan Weil <address@hidden>


  Commit: 78e9d4ad11e7116376328860a58b96765ade7b62
      
https://github.com/qemu/qemu/commit/78e9d4ad11e7116376328860a58b96765ade7b62
  Author: Stefan Weil <address@hidden>
  Date:   2015-11-30 (Mon, 30 Nov 2015)

  Changed paths:
    M configure

  Log Message:
  -----------
  w32: Use gcc option -mthreads

QEMU uses threads / coroutines, therefore support for thread local storage
and thread safe libraries (-D_MT) must be enabled by using -mthreads.

Signed-off-by: Stefan Weil <address@hidden>


  Commit: 680617ed43a2811318ac2df63e686f6b7bc22f55
      
https://github.com/qemu/qemu/commit/680617ed43a2811318ac2df63e686f6b7bc22f55
  Author: Peter Maydell <address@hidden>
  Date:   2015-11-30 (Mon, 30 Nov 2015)

  Changed paths:
    M configure
    M include/sysemu/os-win32.h
    M trace/simple.c
    M util/oslib-win32.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/weil/tags/pull-wxx-20151130' into 
staging

wxx patch queue

# gpg: Signature made Mon 30 Nov 2015 05:48:33 GMT using RSA key ID 677450AD
# gpg: Good signature from "Stefan Weil <address@hidden>"
# gpg:                 aka "Stefan Weil <address@hidden>"
# gpg:                 aka "Stefan Weil <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4923 6FEA 75C9 5D69 8EC2  B78A E08C 21D5 6774 50AD

* remotes/weil/tags/pull-wxx-20151130:
  w32: Use gcc option -mthreads
  oslib-win32: Change return type of function getpagesize
  trace/simple: Fix warning and wrong trace file name for MinGW

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


Compare: https://github.com/qemu/qemu/compare/714487515dbe...680617ed43a2