diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-30 15:35:20 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-30 15:35:20 +0000 |
| commit | 680617ed43a2811318ac2df63e686f6b7bc22f55 (patch) | |
| tree | 403f9a5769dbb45a40bf46b3decb40868390a840 /trace/simple.c | |
| parent | 714487515dbe0c65d5904251e796cd3a5b3579fb (diff) | |
| parent | 78e9d4ad11e7116376328860a58b96765ade7b62 (diff) | |
| download | focaccia-qemu-680617ed43a2811318ac2df63e686f6b7bc22f55.tar.gz focaccia-qemu-680617ed43a2811318ac2df63e686f6b7bc22f55.zip | |
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 <sw@weilnetz.de>" # gpg: aka "Stefan Weil <stefan.weil@weilnetz.de>" # gpg: aka "Stefan Weil <stefan.weil@bib.uni-mannheim.de>" # 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 <peter.maydell@linaro.org>
Diffstat (limited to 'trace/simple.c')
| -rw-r--r-- | trace/simple.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/trace/simple.c b/trace/simple.c index 11ad030937..56a624cac8 100644 --- a/trace/simple.c +++ b/trace/simple.c @@ -329,7 +329,8 @@ bool st_set_trace_file(const char *file) g_free(trace_file_name); if (!file) { - trace_file_name = g_strdup_printf(CONFIG_TRACE_FILE, getpid()); + /* Type cast needed for Windows where getpid() returns an int. */ + trace_file_name = g_strdup_printf(CONFIG_TRACE_FILE, (pid_t)getpid()); } else { trace_file_name = g_strdup_printf("%s", file); } |